[SCM] mediainfo/master: Merge tag 'upstream/0.7.64'

[hyperair at users.alioth.debian.org]

Imported Upstream version 0.7.64
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 129ed9cdb359b32cac9c3b0b0aa8b427a4eeed1d
X-Git-Newrev: 13452933de24deaaca93c41312dd38131fcd16a2

The following commit has been merged in the master branch:
commit 7f9596f733519140c6d741c1002faf5e50e3da68
Merge: 129ed9cdb359b32cac9c3b0b0aa8b427a4eeed1d 490aeb4e97798c5e3bee153ef085d195fa998e8d
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Jul 10 00:44:55 2013 +0800

    Merge tag 'upstream/0.7.64'
    
    Upstream version 0.7.64
    
    Conflicts:
    	debian/changelog
    	debian/control
    	debian/copyright


-- 
mediainfo packaging