]> git.parisson.com Git - telemeta.git/commitdiff
merge unstable
authoryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 10:50:01 +0000 (12:50 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 8 Jun 2011 10:50:01 +0000 (12:50 +0200)
1  2 
telemeta/models/media.py

Simple merge