Merge branch 'release/1.4.4' into lam

Conflicts:
	telemeta/templates/telemeta/mediaitem_detail.html

diff --cc telemeta/models/media.py
Simple merge

diff --cc telemeta/templates/telemeta/mediaitem_detail.html
index bd943c218d8a5104a0da1545333a2d76101d7406,1d6362f9a904b01870e6fd71e51e170a9b9eee72..6a39883f2f4b806cbabd4aa4bc3a233576db2733
--- 1/telemeta/templates/telemeta/mediaitem_detail.html
--- 2/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">