From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 3 Mar 2014 22:49:18 +0000 (+0100)
Subject: Merge branch 'dev' into crem
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7bd2a3392d8f9387e7a95c9db03e94c2d5481269;p=telemeta.git

Merge branch 'dev' into crem

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

7bd2a3392d8f9387e7a95c9db03e94c2d5481269