Merge branch 'lam' of git+ssh://vcs.parisson.com/var/git/telemeta into lam

author yomguy <yomguy@parisson.com>

Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)

committer yomguy <yomguy@parisson.com>

Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)
author yomguy <yomguy@parisson.com>
Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)
committer yomguy <yomguy@parisson.com>
Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)
diff --cc telemeta/templates/telemeta/mediaitem_detail.html
Simple merge
author	yomguy <yomguy@parisson.com>
	Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)
committer	yomguy <yomguy@parisson.com>
	Fri, 27 Sep 2013 10:08:45 +0000 (12:08 +0200)