From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 21 Feb 2014 16:47:06 +0000 (+0100)
Subject: Merge branch 'crem' into diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3da234d39057fa83baa3352b58c2f428e3ea1ebb;p=telemeta.git

Merge branch 'crem' into diadems

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

3da234d39057fa83baa3352b58c2f428e3ea1ebb