]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 12:46:02 +0000 (14:46 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 12:46:02 +0000 (14:46 +0200)
commitf68c7b8004dad66451e036fba4ad2ab77791e14f
treec6a951ce478f8d1d507d06b67969d0ba8e6d2340
parent7439ba46418c9d15303390e4aa14b72b1b5014c1
parentd00644df36d55a1d197d985982918ebbd9409334
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/django.po
telemeta/locale/fr/LC_MESSAGES/djangojs.mo
telemeta/locale/fr/LC_MESSAGES/djangojs.po
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