[SCM] mediaconch/master: Merge tag 'upstream/15.12'

[hyperair at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 06bf564ac97449a140ea9750156005631f646dd7
Merge: 62390bb37bbe33768a13f9fd4a17d80d10e58f46 d2f2dd94ebbc81d7b5b398c0b56be941d881b635
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon Jan 11 01:39:49 2016 +0800

    Merge tag 'upstream/15.12'
    
    Upstream version 15.12
    
    # gpg: Signature made Mon 11 Jan 2016 01:39:48 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>"


-- 
mediaconch packaging