Merge branch 'dev' into crem

author yomguy <yomguy@parisson.com>

Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)

committer yomguy <yomguy@parisson.com>

Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
author yomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
committer yomguy <yomguy@parisson.com>
Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
diff --cc telemeta/templates/telemeta/mediaitem_detail.html
Simple merge
author	yomguy <yomguy@parisson.com>
	Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)
committer	yomguy <yomguy@parisson.com>
	Thu, 4 Oct 2012 10:51:34 +0000 (12:51 +0200)