]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:27:47 +0000 (09:27 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 8 Jan 2013 08:27:47 +0000 (09:27 +0100)
commit909dc1ffb96dc3d691b994c85851059574f46d0a
treedb8ac7e09555fd5cbe2e196278ad897b78a32ec2
parenteb09396081981a3593ceadded9f11b89d78197f5
parent6348e27890c68e7c8a452f1cb46c21b18a0ce378
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
telemeta/models/media.py
telemeta/util/xmltodict2.py