]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 28 Nov 2011 22:02:59 +0000 (23:02 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 28 Nov 2011 22:02:59 +0000 (23:02 +0100)
commita001dc08470bd123e40856d2b014e3b1049f9145
treeafd7707c2450dc890650dc913ded27c74c27289f
parent4a62799d0d8882cd04e12d30cb2ce96e9b2f4870
parentc6d752c194b0085e87aa3c44bc3e4ca6df4f8ceb
Merge branch 'master' into crem

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