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

[sramacher at users.alioth.debian.org]

Imported Upstream version 1.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4297ad87eae49a17fb46314aa5697e65ff7746d6
X-Git-Newrev: f455c5614d663af43195dc21e83043b0a3c719d9

The following commit has been merged in the master branch:
commit 48b09f75d9587477ab26105f80517262e784c8b7
Merge: 4297ad87eae49a17fb46314aa5697e65ff7746d6 744a88d0fea0979d1e641cfc2c4433a26f0fae52
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Dec 9 16:32:40 2013 +0100

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2


-- 
libdvbpsi packaging