Merge branch 'develop' into lam

Conflicts:
	telemeta/templates/telemeta/mediaitem_detail.html

diff --cc telemeta/__init__.py
index bf3a0b547c05e3227ed653a54259c52c2ca9bdc6,bf3a0b547c05e3227ed653a54259c52c2ca9bdc6..32227806dfe2902bae57ad5388ab0e6be7b0b26b
--- 1/telemeta/__init__.py
--- 2/telemeta/__init__.py
+++ b/telemeta/__init__.py
@@@ -12,7 -12,7 +12,7 @@@ U{http://telemeta.org
  """
  
  __docformat__ = 'epytext en'
--__version__ = '1.4.3'
++__version__ = '1.4.4'
  __url__ = 'http://telemeta.org'
  __copyright__ = '(C) 2007-2012 Parisson'
  __license__ = 'CeCILL-2'

diff --cc telemeta/templates/telemeta/mediaitem_detail.html
index d6f536939c73644e2e2d53bf19262ebabdb833f0,d1774812686615f947ee0fa625d7215ce6f322f9..2a2a96e918661cf55610d155cfdfb2f7d622c1ef
--- 1/telemeta/templates/telemeta/mediaitem_detail.html
--- 2/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@@ -190,8 -190,7 +190,6 @@@ Item : <a href="{% url telemeta-item-de
          <dl class="listing">
              {% dl_field item "title" placeholder %}
              {% dl_field item "alt_title" %}
- 
--
              {% dl_field item "collector" placeholder %}
              <dt>{% field_label item "collection" %}</dt>
              <dd><a href="{% url telemeta-collection-detail item.collection.public_id %}">{{ item.collection }}</a></dd>