[SCM] gmerlin/master: Merge tag 'upstream/1.2.0_dfsg'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e80bca64d09765c66a42e27996a8e1ae216d418
X-Git-Newrev: 6381c443af8a474dab930661a4308930aa0991cd

The following commit has been merged in the master branch:
commit 6381c443af8a474dab930661a4308930aa0991cd
Merge: bf13fbd41c7042c34ab01042b0f17e40680fdf43 30846e41c7afdeab095be93e41519cf353b38083
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jun 11 12:58:46 2012 +0200

    Merge tag 'upstream/1.2.0_dfsg'
    
    Upstream version 1.2.0~dfsg
    # gpg: Signature made lun 11 giu 2012 12:58:45 CEST using RSA key ID 311D765A
    # gpg: Good signature from "Alessio Treglia <quadrispro at gmail.com>"
    # gpg:                 aka "Alessio Treglia <alessio at debian.org>"
    # gpg:                 aka "Alessio Treglia <quadrispro at ubuntu.com>"


-- 
gmerlin packaging