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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.1.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: 6ddb8769c2ea661e9e0f0d8cd0599b21047f02a4
X-Git-Newrev: 4297ad87eae49a17fb46314aa5697e65ff7746d6

The following commit has been merged in the master branch:
commit 2378972db713ed34576b01ccd6df79d8aeff1daa
Merge: 6ddb8769c2ea661e9e0f0d8cd0599b21047f02a4 7d13d379696a17e1fb6e3d357cbc36429716b67f
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 4 16:26:34 2013 +0100

    Merge tag 'upstream/1.1.1'
    
    Upstream version 1.1.1


-- 
libdvbpsi packaging