summaryrefslogtreecommitdiff
path: root/AUTHORS
diff options
context:
space:
mode:
authorNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 00:46:06 -0300
committerNicolas Reynolds <fauno@kiwwwi.com.ar>2012-02-05 00:46:06 -0300
commit9f28620de84a5a35d2ca029ad9145a4b01233929 (patch)
treeedebbb57370c84a6df7bddf7dfb8617edb22eab7 /AUTHORS
parentd2abc7fe1075bf541cd85b29e8053096ab74fb29 (diff)
parentc5d7675fa4de40514deda2757cd027bb4870424e (diff)
Merge branch 'master' into fauno
Conflicts: is_built
Diffstat (limited to 'AUTHORS')
0 files changed, 0 insertions, 0 deletions