[SCM] liblivemedia/master: Merge tag 'upstream/2016.01.12'

[sramacher at users.alioth.debian.org]

Imported Upstream version 2016.01.12
Imported Upstream version 2015.12.22
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5a5058dfca2eecb6d44407b3dd9cdb6c88be2964
X-Git-Newrev: 75453d1e20e39010916f6cbd7c1f7ffd9ac77f7e

The following commit has been merged in the master branch:
commit 4d0fa69b75e5c19a39269431440ea4f259b897f0
Merge: 5a5058dfca2eecb6d44407b3dd9cdb6c88be2964 99c125239804a5ea4f3267cfcd2a09ed82deba44
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jan 12 20:59:15 2016 +0100

    Merge tag 'upstream/2016.01.12'
    
    Upstream version 2016.01.12


-- 
liblivemedia packaging