]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Tue, 13 Dec 2011 14:36:02 +0000 (15:36 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 13 Dec 2011 14:36:02 +0000 (15:36 +0100)
commitecd79645f22e25895a689c81c1dd2ab818d6ea17
treee1b6be76fd53fb43e195dbac9a42efaa003a26b1
parent7e668e178eb724aaade8e10183d4ef765063c88a
parent91bae444089bd20819a896a75ec912463cdd0ea7
Merge branch 'master' into crem

Conflicts:
telemeta/models/media.py
telemeta/models/media.py