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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit e7ff38a75058c74b96e9b514c9a3c67e17d774e3
Merge: 36a6309598f72943501f46808e125532af39095c 00e2c348a7623f56ebd3ce3d4a0184a7cf0742d9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sun Dec 23 15:42:59 2012 +0100

    Merge tag 'upstream/2012.12.23'
    
    Upstream version 2012.12.23


-- 
liblivemedia packaging