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)
commitf7d31bfa92b794379603d0d55a7eb03b67b4e284
tree72ef77196090942cac9ddad479c49ed82b4d96d5
parentdb9ab7a1e991759ccbb7dc5c13af41a0b24cca40
parentf43ef2dafee43fec2945dfdf28c638803a9a10d3
Merge branch 'master' into force-cache

Conflicts:
translations/fr/tiramisu.po
translations/tiramisu.pot
tiramisu/config.py
translations/fr/tiramisu.po
translations/tiramisu.pot