]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Fri, 27 Apr 2012 11:12:12 +0000 (13:12 +0200)
committeryomguy <yomguy@parisson.com>
Fri, 27 Apr 2012 11:12:12 +0000 (13:12 +0200)
1  2 
telemeta/models/media.py
telemeta/views/base.py

Simple merge
Simple merge