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

[foka at users.alioth.debian.org]

Imported Upstream version 15.09
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 da8c8bb6cc33d9fbacc19d5506020c1f6b85938b
Merge: 5c3586af3d021813d5881f92be208da52d2bd2a1 3c31250f56bebed018843ee12236349aca0804b1
Author: Anthony Fok <foka at debian.org>
Date:   Tue Dec 15 18:23:28 2015 -0700

    Merge tag 'upstream/15.09'
    
    Upstream version 15.09


-- 
mma packaging