From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 20 Jan 2014 22:49:43 +0000 (+0100)
Subject: Merge branch 'dev' into crem2
X-Git-Tag: 1.5.0rc3~6
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=846efe80f7452640de410e9883a930302165e727;p=telemeta.git

Merge branch 'dev' into crem2

Conflicts:
	telemeta/views/collection.py
---

846efe80f7452640de410e9883a930302165e727