Merge branch 'dev' into lam2

author Guillaume Pellerin <yomguy@parisson.com>

Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)

committer Guillaume Pellerin <yomguy@parisson.com>

Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
author Guillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
committer Guillaume Pellerin <yomguy@parisson.com>
Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
diff --cc telemeta/templates/telemeta/mediaitem_detail.html
Simple merge
author	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)
committer	Guillaume Pellerin <yomguy@parisson.com>
	Mon, 27 Apr 2015 14:45:07 +0000 (16:45 +0200)