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

[bdrung at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 403119cada438743958681783e29dc4fc805a158
Merge: d9a5d7e82fe19ba942a0647380a8349581d65f24 b17580cc66238e1a6142f531274abf8a136692b9
Author: Benjamin Drung <bdrung at debian.org>
Date:   Fri Dec 21 13:29:44 2012 +0100

    Merge tag 'upstream/2012.12.21'
    
    Upstream version 2012.12.21


-- 
liblivemedia packaging