From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 15 Dec 2014 16:24:55 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=51e7a241a5422bdbecc23a5adb8f76304c67f241;p=telemeta.git

Merge branch 'dev' into crem2

Conflicts:
	telemeta/locale
	telemeta/locale/de/LC_MESSAGES/django.po
---

51e7a241a5422bdbecc23a5adb8f76304c67f241