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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit b7fa63cc3c52f5f2c42b29c9d6333b31d325ac86
Merge: 20d395c5165f3a7379ce84227762b90ded3b8199 30aec4ee4327ca480e4235af2f56907eb873a0df
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Dec 24 02:08:09 2012 +0100

    Merge tag 'upstream/2012.12.24'
    
    Upstream version 2012.12.24


-- 
liblivemedia packaging