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

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
Imported Upstream version 0.7.65
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 13452933de24deaaca93c41312dd38131fcd16a2
X-Git-Newrev: 48aa9128f891fe21dddfb3c01b15254476de3317

The following commit has been merged in the master branch:
commit 1c14d11052e8de4d82480d04c06bb52311ee9cb9
Merge: 13452933de24deaaca93c41312dd38131fcd16a2 84a11c4a320e414d367be98ab877cc416fc5488b
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Nov 26 23:03:28 2013 +0800

    Merge branch 'dfsg'
    
    Conflicts:
    	MediaInfo_Source/debian/changelog
    	MediaInfo_Source/debian/control
    	MediaInfo_Source/debian/copyright


-- 
mediainfo packaging