]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Thu, 10 Nov 2011 13:02:18 +0000 (14:02 +0100)
committeryomguy <yomguy@parisson.com>
Thu, 10 Nov 2011 13:02:18 +0000 (14:02 +0100)
commit2debf26cb59c954453ea007e5ce55b77fc12ebba
tree2f2eee7c2b49d5a63e83cfb0cee46ace7e648884
parent618d7ec4783116cac133617e53736c674364b7c8
parentfb59680910b5c694bdb481004ef10b15c1f9b06f
Merge branch 'master' into crem
telemeta/models/media.py