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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.2.0~dfsg0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: dbbff5c7300befff40944ad8ab38f13618e2d9c8
X-Git-Newrev: 0857e1e2f5c82ff5b48fe73246337e6c6e807d46

The following commit has been merged in the master branch:
commit 0857e1e2f5c82ff5b48fe73246337e6c6e807d46
Merge: 34b28b8f922a8ca694ae512257f1e1f01972d0a8 231b1891644048aab3dbc3b44180210f4fb12b67
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 12 16:57:44 2012 +0000

    Merge tag 'upstream/1.2.0_dfsg0'
    
    Upstream version 1.2.0~dfsg0


-- 
gmerlin packaging