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)
commit6413d460b288b0db51866cc160f137e444246245
treec5f08d4d41af6dcb44006c0d6a917f05191f1f87
parent5fd62e2a9624a54e5b86c94f65ec73be91190a2c
parentff5376a382f4fc48b16f695357bbe1de3b4cd021
Merge branch 'better_auto_save'

Conflicts:
test/test_freeze.py
tiramisu/option.py
translations/fr/tiramisu.po
translations/tiramisu.pot