From: yomguy <yomguy@parisson.com>
Date: Tue, 8 Jan 2013 08:34:57 +0000 (+0100)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9640be207ec26901b07e8d4867dad38c4ecff4ad;p=telemeta-pages.git

Merge branch 'dev' into crem

Conflicts:
	telemeta/locale/de/LC_MESSAGES/django.mo
	telemeta/locale/de/LC_MESSAGES/djangojs.mo
	telemeta/locale/fr/LC_MESSAGES/django.mo
	telemeta/locale/fr/LC_MESSAGES/djangojs.mo
---

9640be207ec26901b07e8d4867dad38c4ecff4ad