[SCM] liblivemedia/upstream: Merge remote-tracking branch 'origin/upstream' into upstream

[sramacher at users.alioth.debian.org]

Imported Upstream version 2016.05.20
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 7b798c284d1c964559619b3c332d446cd75376df
X-Git-Newrev: 0dde08e99871f5146daea507e8190f85c8bf1a05

The following commit has been merged in the upstream branch:
commit 0dde08e99871f5146daea507e8190f85c8bf1a05
Merge: ee6f6d4ddcaa9a60c591b72f3bc22489762e48ee 7b798c284d1c964559619b3c332d446cd75376df
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Jun 27 21:51:36 2016 +0200

    Merge remote-tracking branch 'origin/upstream' into upstream


-- 
liblivemedia packaging