]> git.parisson.com Git - telemeta-pages.git/commit
Merge branch 'dev' into crem
authoryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:34:57 +0000 (09:34 +0100)
commit3efa04752e18c073b00e912fd836b69c61ef714d
tree3e3034625772028cc2f9c6d9babf331f788946bd
parent58264c47d5582e057b168ae2dcda49d721d78503
parent4c863d8719692bd984f5cf75b19e752351344e78
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
de/LC_MESSAGES/django.mo
de/LC_MESSAGES/django.po
de/LC_MESSAGES/djangojs.mo
de/LC_MESSAGES/djangojs.po
fr/LC_MESSAGES/django.mo
fr/LC_MESSAGES/django.po
fr/LC_MESSAGES/djangojs.mo
fr/LC_MESSAGES/djangojs.po