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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 25ab817dca4ed46e06250adf76e748f0edc0645e
Merge: e918e28332245a2a744027bf44b5e40183e9f6a4 8bc261f063e28c7739fb56f85cb1ddec1f173d4b
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jun 6 12:10:56 2012 +0200

    Merge tag 'upstream/2012.05.17'
    
    Upstream version 2012.05.17


-- 
liblivemedia packaging