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

[hyperair at users.alioth.debian.org]

Imported Upstream version 0.7.67
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 48aa9128f891fe21dddfb3c01b15254476de3317
X-Git-Newrev: 1f03264678f87e7667a3ea0e338b2a37be683907

The following commit has been merged in the master branch:
commit 173c42ea2d4569cb7a55b2aa8d4b4f7f01fcd92c
Merge: 48aa9128f891fe21dddfb3c01b15254476de3317 9875916bfa83834ad5d887fc0a8df20acc3751f8
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Tue Jan 14 02:04:21 2014 +0800

    Merge tag 'upstream/0.7.67'
    
    Upstream version 0.7.67
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/mediainfo-gui.install
    	debian/mediainfo.install
    	debian/rules


-- 
mediainfo packaging