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

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.7.60
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5fcdb94afbbc3cdbf5588427551ae581d92e53be
X-Git-Newrev: 1fc76233de7eead1cb91fad201068310607f2bf6

The following commit has been merged in the master branch:
commit f0a5caa2704de140350066524a0fdd895abc3520
Merge: 5fcdb94afbbc3cdbf5588427551ae581d92e53be d2b968fe5c9eda98c651136514534342c23a7597
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Sep 4 21:52:37 2012 +0800

    Merge branch 'dfsg'


-- 
mediainfo packaging