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

[bdrung at users.alioth.debian.org]

Imported Upstream version 2012.12.15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 7d6cb366538959d2473796c10aa837b0ab0ef477
X-Git-Newrev: 3536efef106bfce604f74b0684c47d6235c60ec1

The following commit has been merged in the master branch:
commit 38ae774d53049434fc2c23c67fb2038bfd7dd240
Merge: 7d6cb366538959d2473796c10aa837b0ab0ef477 a55b677d0bb268719d7f7e605fe5d446be4ed56f
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 15 10:45:39 2012 +0100

    Merge tag 'upstream/2012.12.15'
    
    Upstream version 2012.12.15


-- 
liblivemedia packaging