From: yomguy <yomguy@parisson.com>
Date: Sun, 8 Jul 2012 23:20:40 +0000 (+0200)
Subject: Merge branch 'hotfix/registration' into dev
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9cf89033785575b3792e4c79bc4c1372a7fb867e;p=telemeta-pages.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
---

9cf89033785575b3792e4c79bc4c1372a7fb867e