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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit b3832145a3c0909e0b0a480d119a49554a46a874
Merge: 99aa3707b533315a3e52e63b7aa8cb2d27d46be0 64b5b4eff009d37747bfc1dc6385ca1ba30e4005
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Thu Jan 15 12:28:09 2015 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging