[SCM] mediainfo/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: c81f2604cb029f97c5767b8f44dc561f42923f96
X-Git-Newrev: 129ed9cdb359b32cac9c3b0b0aa8b427a4eeed1d

The following commit has been merged in the master branch:
commit 7c251c370cf99ba7db40851579d488aa64fb7e4d
Merge: c81f2604cb029f97c5767b8f44dc561f42923f96 feb68b55e262f51c0d351e4f264ff1d89f8e13c3
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Fri May 17 21:35:14 2013 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging