[SCM] libmediainfo/master: Merge branch 'dfsg'

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.7.63
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f01472da7eaf2dd921a4b581449fc80ae8979136
X-Git-Newrev: 94168bafbe023b8f4762ad579283946fc176be3e

The following commit has been merged in the master branch:
commit 8a5fb5a36b5171c399d16bb1f4a761ea4ac25adb
Merge: f01472da7eaf2dd921a4b581449fc80ae8979136 8f581385cfde3f9d028bca0d2bb15c87a1dbe6a0
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu May 16 22:46:43 2013 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging