From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 22 Jan 2016 10:02:42 +0000 (+0100)
Subject: Merge branch 'dev'
X-Git-Tag: 1.6b~7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=b9f81f4906e0692ab49879faa36f8975e75d8ce5;p=telemeta.git

Merge branch 'dev'

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

b9f81f4906e0692ab49879faa36f8975e75d8ce5