]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:06:04 +0000 (10:06 +0200)
committeryomguy <yomguy@parisson.com>
Thu, 7 Jun 2012 08:06:04 +0000 (10:06 +0200)
commit5856547c4d2f77b6a5e84d82eb71974026ab4244
tree70f384d6e0376a9acb1711a9edf4f9c0a66c976b
parent4cc87cba9f6da44050ddf00aeab533fcef89cf31
parent188eaaaaf99883a3cb313ca9e9e0bfa8d1f4ea39
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.po
telemeta/locale/de/LC_MESSAGES/djangojs.po
telemeta/locale/fr/LC_MESSAGES/django.po
telemeta/models/media.py