Emmanuel Garette f7d31bfa92 Merge branch 'master' into force-cache ... Conflicts: translations/fr/tiramisu.po translations/tiramisu.pot		2014-03-15 10:09:19 +01:00
..
tiramisu.po	Merge branch 'master' into force-cache	2014-03-15 10:09:19 +01:00