[SCM] libmediainfo/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: 21268b7ec7b8eb53e2d5fc91719ab3e19ccb5075
X-Git-Newrev: 0ca831aaed4d0246d444de3691844910eab8444f

The following commit has been merged in the master branch:
commit d4de974785b5317ba8716fdb255a30a9d1492d5b
Merge: 21268b7ec7b8eb53e2d5fc91719ab3e19ccb5075 15d5ca0a1bcc86d4ac4f16c4698f52d481b48400
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Nov 26 01:31:38 2013 +0800

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


-- 
libmediainfo packaging