[SCM] cantata/master: Merge tag 'upstream/1.5.2.ds1'

[stuart at users.alioth.debian.org]

Imported Upstream version 1.5.2.ds1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 05199489defe2153c420c87ac615c796b565ea36
X-Git-Newrev: 1403707b8de832a5d7c6678debc203e97b4c9761

The following commit has been merged in the master branch:
commit 546f95838acc937464cbb4d36e52b9910739b0a5
Merge: 05199489defe2153c420c87ac615c796b565ea36 ea299e3a687e3bb92d91e9a7e6f98dc49a79bf69
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Apr 27 00:33:04 2015 +1000

    Merge tag 'upstream/1.5.2.ds1'
    
    Upstream version 1.5.2.ds1
    
    # gpg: Signature made Mon 27 Apr 2015 00:32:57 AEST using RSA key ID 1396F2F7
    # gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart+debian at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart at debian.org>"


-- 
cantata packaging