]> git.parisson.com Git - telemeta.git/commitdiff
projects / telemeta.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 870e107 bc4fa89)
merge from unstable
authoryomguy <yomguy@parisson.com>
Tue, 7 Jun 2011 13:17:05 +0000 (15:17 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 7 Jun 2011 13:17:05 +0000 (15:17 +0200)
1  2 
telemeta/models/media.py patch | diff1 | diff2 | blob | history

diff --cc telemeta/models/media.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.