From: yomguy <yomguy@parisson.com>
Date: Wed, 30 Nov 2011 10:06:44 +0000 (+0100)
Subject: Merge branch 'master' into crem
X-Git-Tag: 1.3.9~3^2~1^2~17
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8b60ef24af235d3e6d66934c27aa7fde21744ef2;p=telemeta.git

Merge branch 'master' into crem

Conflicts:
	telemeta/models/media.py
---

8b60ef24af235d3e6d66934c27aa7fde21744ef2