[SCM] libmediainfo/master: Merge branch 'dfsg'

[hyperair at users.alioth.debian.org]

Merge branch 'upstream' into dfsg
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: 0ca831aaed4d0246d444de3691844910eab8444f
X-Git-Newrev: f109462f1ceab5a12f7b532498969bb72aab3a9a

The following commit has been merged in the master branch:
commit e7f1173816fadc667d580bd18bf65abe5167309c
Merge: 0ca831aaed4d0246d444de3691844910eab8444f aa2a6cd06c725f68c620ab3f2b49a21ef3ebc888
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Jan 13 01:58:35 2014 +0800

    Merge branch 'dfsg'


-- 
libmediainfo packaging