]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 10:06:44 +0000 (11:06 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 30 Nov 2011 10:06:44 +0000 (11:06 +0100)
commit8b60ef24af235d3e6d66934c27aa7fde21744ef2
tree1ea4552f8f8367fd0ce732b978b566853355ca76
parentca06febf7485b54f7f4aefc177895151fbb141e1
parenteaaaaae5ec6be9ff17fd84facd4cae3e1cb14077
Merge branch 'master' into crem

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