Fix error during merge
authorArnaud Delcasse <arnaud@delcasse.fr>
Tue, 4 Sep 2012 19:21:43 +0000 (21:21 +0200)
committerArnaud Delcasse <arnaud@delcasse.fr>
Tue, 4 Sep 2012 19:21:43 +0000 (21:21 +0200)
commit60cbdb2b48d0038f54294546a013aeffc94ddc90
tree2809ef3199e1c72d051f92570080ecec7e2fb6d5
parent90a7047aad9842eb067815c0bcacc30766e93dcb
Fix error during merge
main.py