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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 06c661903595d9142fac920e74770c14932e996b
Merge: c8bd5e576c722f360d8c45b4516794b3f06eda2f 1373c14486924b6b1f3e03d4590d21fe8f54e182
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Jan 13 22:23:59 2014 +0100

    Merge tag 'upstream/2014.01.13'
    
    Upstream version 2014.01.13


-- 
liblivemedia packaging