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

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 26a0b94726596d0a2c6cbac3d52e313bb5cf4039
Merge: ffc3005b138a639f371c627e5e6a19d56664021a 6b3a5a1d1f1f8ad8dfea5f1f9bf064e2f9876d27
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon May 5 03:25:39 2014 +0800

    Merge tag 'upstream/0.7.69'
    
    Upstream version 0.7.69


-- 
libmediainfo packaging