From: yomguy <yomguy@parisson.com>
Date: Mon, 1 Oct 2012 13:07:46 +0000 (+0200)
Subject: Merge branch 'dev' into lam
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4701f3a1bc1fe3594928cb5c7ebd78321234dbf2;p=telemeta.git

Merge branch 'dev' into lam

Conflicts:
	telemeta/templates/telemeta/mediaitem_detail.html
	telemeta/views/item.py
---

4701f3a1bc1fe3594928cb5c7ebd78321234dbf2