]> git.parisson.com Git - telemeta.git/commit
Merge branch 'dev' into lam
authoryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +0200)
committeryomguy <yomguy@parisson.com>
Tue, 25 Sep 2012 10:12:46 +0000 (12:12 +0200)
commit93317028583ca2529e166e2c4e378d0b7fb64f89
tree45e38959e5a77ce2cb4ff1dcc9aa2ca515e3062b
parentaa1889e62a8d0b8da1bcfb135d414c6ae9800308
parent5a819a670d0b9dc84ceb2189aca3e871114347fb
Merge branch 'dev' into lam
telemeta/models/media.py