[SCM] libdvbpsi/master: Merge tag 'upstream/1.2.0'

[sramacher at users.alioth.debian.org]

Imported Upstream version 1.2.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e7268aca6fecace84ceb131a5ce3389e3e7821a2
X-Git-Newrev: 3d7be2e5f062af155e5195a53fda74808e39e2a4

The following commit has been merged in the master branch:
commit ca82a71b18ed3739198bf8873a69a328546c02a9
Merge: 46ce28b0b93ecee6bc97388d63172a2bec974779 988eb0ce6ed2786072945350916e950d6ba490f5
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Apr 28 17:22:00 2014 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0


-- 
libdvbpsi packaging