From: yomguy <yomguy@parisson.com>
Date: Sun, 27 May 2012 17:24:28 +0000 (+0200)
Subject: Merge branch 'develop' into lam
X-Git-Tag: 1.4.3-2^2~4
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a7f10c19d3d7d4da68a3ae5b874200178f6950d1;p=telemeta.git

Merge branch 'develop' into lam

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

a7f10c19d3d7d4da68a3ae5b874200178f6950d1
diff --cc telemeta/__init__.py
index bf3a0b54,bf3a0b54..32227806
--- a/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 d6f53693,d1774812..2a2a96e9
--- a/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>