]> git.parisson.com Git - telemeta.git/commit
Merge branch 'master' into crem
authoryomguy <yomguy@parisson.com>
Wed, 7 Dec 2011 16:25:12 +0000 (17:25 +0100)
committeryomguy <yomguy@parisson.com>
Wed, 7 Dec 2011 16:25:12 +0000 (17:25 +0100)
commit7e668e178eb724aaade8e10183d4ef765063c88a
tree9063508b041e51264c16d8241cc95c4672642f4d
parentc6401d6e667c9c2e932913971c2daed777f96207
parent06ce8dd26c3f25f080bcda7bf988c00eccea3fdb
Merge branch 'master' into crem

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