[SCM] mediainfo/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: bc6c79b864cbfe7316cb1f3b5073e2b2868d7e36
X-Git-Newrev: 2af19b7ec4939f84fd1e2a67b28a7473ce61ffb6

The following commit has been merged in the master branch:
commit 77b39b6c540c476ee5a872bda49993ccbc60a546
Merge: bc6c79b864cbfe7316cb1f3b5073e2b2868d7e36 17045c0045dcf51304e29015aa10c2cd79c9fc07
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon May 5 03:26:17 2014 +0800

    Merge tag 'upstream/0.7.69'
    
    Upstream version 0.7.69
    
    # gpg: Signature made Mon 05 May 2014 03:26:16 AM SGT using RSA key ID 588752A1
    # gpg: Good signature from "Chow Loong Jin <hyperair at debian.org>"
    # gpg:                 aka "Chow Loong Jin <hyperair at ubuntu.com>"
    # gpg:                 aka "Chow Loong Jin <chow0082 at e.ntu.edu.sg>"
    # gpg:                 aka "Chow Loong Jin <hyperair at gmail.com>"
    # gpg:                 aka "Chow Loong Jin <chow0082 at ntu.edu.sg>"
    # gpg:                 aka "Chow Loong Jin <loongjin at solution-space.com>"
    # gpg:                 aka "Chow Loong Jin <lchow at redhat.com>"


-- 
mediainfo packaging