Merge branch 'better_auto_save'
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 29 Mar 2014 19:44:10 +0000 (20:44 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 29 Mar 2014 19:44:10 +0000 (20:44 +0100)
Conflicts:
test/test_freeze.py
tiramisu/option.py
translations/fr/tiramisu.po
translations/tiramisu.pot


Trivial merge