[SCM] libmediainfo/master: Merge tag 'upstream/0.7.68'

[hyperair at users.alioth.debian.org]

Imported Upstream version 0.7.68
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 0514690b132ab49ef22d9eae62c4e25016650c05
X-Git-Newrev: ffc3005b138a639f371c627e5e6a19d56664021a

The following commit has been merged in the master branch:
commit 7202924f87e7e1f8990791bd61d37b90bcc3603e
Merge: 0514690b132ab49ef22d9eae62c4e25016650c05 eb215b4a26802c2079c8d0a7e1a27aeecfea3e97
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Wed Apr 9 02:12:40 2014 +0800

    Merge tag 'upstream/0.7.68'
    
    Upstream version 0.7.68
    
    Conflicts:
    	debian/changelog
    	debian/compat
    	debian/control
    	debian/copyright
    	debian/libmediainfo-dev.install
    	debian/libmediainfo0.install
    	debian/rules


-- 
libmediainfo packaging