]> git.parisson.com Git - telemeta.git/commitdiff
Merge branch 'master' into dev
authoryomguy <yomguy@parisson.com>
Wed, 2 May 2012 13:34:04 +0000 (15:34 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 2 May 2012 13:34:04 +0000 (15:34 +0200)
1  2 
telemeta/models/media.py
telemeta/views/base.py

Simple merge
Simple merge