From: yomguy Date: Thu, 7 Jun 2012 08:14:49 +0000 (+0200) Subject: Merge branch 'dev' into lam X-Git-Tag: 1.4.4-lam~20 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3e38b890e7a6df009988a4694a7f7065e2be61bd;p=telemeta.git Merge branch 'dev' into lam Conflicts: telemeta/locale/de/LC_MESSAGES/django.mo telemeta/locale/de/LC_MESSAGES/django.po telemeta/locale/de/LC_MESSAGES/djangojs.mo telemeta/locale/de/LC_MESSAGES/djangojs.po telemeta/locale/fr/LC_MESSAGES/django.mo telemeta/locale/fr/LC_MESSAGES/djangojs.mo --- 3e38b890e7a6df009988a4694a7f7065e2be61bd