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

[foka 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: 210d207eb4a21ff545fd013a9848532b59b23502
X-Git-Newrev: 3c5492187110ad082929bb2716a50ad84de36087

The following commit has been merged in the master branch:
commit 3c5492187110ad082929bb2716a50ad84de36087
Merge: a28d24569d6b76d15ad776bec670d5bf296d81bf 81847b3fafda4e01aae95e9a7eb2cdd27367a02f
Author: Anthony Fok <foka at debian.org>
Date:   Tue Dec 15 18:26:50 2015 -0700

    Merge tag 'upstream/15.12'
    
    Upstream version 15.12


-- 
mma packaging