From: yomguy <yomguy@parisson.com>
Date: Sun, 8 Jul 2012 23:20:40 +0000 (+0200)
Subject: Merge branch 'hotfix/registration' into dev
X-Git-Tag: 1.4.4~1^2~2
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5a2b932812553ef2c7ceed57a7e98abdf09f7521;p=telemeta.git

Merge branch 'hotfix/registration' into dev

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/django.po
	telemeta/locale/fr/LC_MESSAGES/djangojs.mo
	telemeta/locale/fr/LC_MESSAGES/djangojs.po
---

5a2b932812553ef2c7ceed57a7e98abdf09f7521