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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0~dfsg+1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 3a43c1f0091149b0a13b4e3887e499824c52e1b2
X-Git-Newrev: a14721566cf145bbcbb4a6750bb525bb173498d5

The following commit has been merged in the master branch:
commit f5c09ba4e2bb0e0e3421b7fea5454eae17fcd256
Merge: 3a43c1f0091149b0a13b4e3887e499824c52e1b2 54ddc48af61a4b539bba3703c94c059f212b6c66
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Dec 13 15:56:43 2012 +0000

    Merge tag 'upstream/1.2.0_dfsg+1'
    
    Upstream version 1.2.0~dfsg+1


-- 
gmerlin packaging