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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 9082786750b568dd418fb7ee478b9842f2ec5215
Merge: 8e83e3f0c0c4dc47dfd48be0af00e42572bf4e81 31293c64260ff57159376c5ed5d834321132eda8
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Dec 22 13:16:37 2012 +0100

    Merge tag 'upstream/2012.12.22'
    
    Upstream version 2012.12.22


-- 
liblivemedia packaging