From: yomguy <yomguy@parisson.com>
Date: Thu, 31 May 2012 23:28:48 +0000 (+0200)
Subject: Merge branch 'release/1.4.4' into lam
X-Git-Tag: 1.4.4-lam~23
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4cc87cba9f6da44050ddf00aeab533fcef89cf31;p=telemeta.git

Merge branch 'release/1.4.4' into lam

Conflicts:
	telemeta/templates/telemeta/mediaitem_detail.html
---

4cc87cba9f6da44050ddf00aeab533fcef89cf31
diff --cc telemeta/templates/telemeta/mediaitem_detail.html
index bd943c21,1d6362f9..6a39883f
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@@ -255,7 -269,7 +255,7 @@@ Item : <a href="{% url telemeta-item-de
      </div>
  
      <div class="extraInfos">
--        {% block archive_data %}
++    {% block archive_data %}
          <div>
              <h4><a href="#">{% trans "Archiving data" %}</a></h4>
              <dl class="listing">