]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Mon, 28 Nov 2011 16:43:42 +0000 (17:43 +0100)
committeryomguy <yomguy@parisson.com>
Mon, 28 Nov 2011 16:43:42 +0000 (17:43 +0100)
commit4a62799d0d8882cd04e12d30cb2ce96e9b2f4870
tree630d1ce2a8b86b597b929d03dfbc3bb4f5b14896
parent3471ccfa2b49033b27a09bb93f8d3fc78da8c9aa
parentef3157d05bd340a92282e45529eba4cfc2dab998
Merge branch 'master' into crem

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