From: yomguy <yomguy@parisson.com>
Date: Fri, 20 Jul 2012 08:50:12 +0000 (+0200)
Subject: Merge branch 'release/1.4.4' into dev
X-Git-Tag: 1.4.4-lam~19^2~1^2~1
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=73ec04eae4a2e3d194e1eacf3e21b4c15139b33b;p=telemeta.git

Merge branch 'release/1.4.4' into dev

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

73ec04eae4a2e3d194e1eacf3e21b4c15139b33b