Merge branch 'master' into force-cache
authorEmmanuel Garette <egarette@cadoles.com>
Sat, 15 Mar 2014 09:09:19 +0000 (10:09 +0100)
committerEmmanuel Garette <egarette@cadoles.com>
Sat, 15 Mar 2014 09:09:19 +0000 (10:09 +0100)
Conflicts:
translations/fr/tiramisu.po
translations/tiramisu.pot

1  2 
tiramisu/config.py
translations/fr/tiramisu.po
translations/tiramisu.pot

Simple merge
Simple merge
Simple merge