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

[stuart at users.alioth.debian.org]

Imported Upstream version 1.5.2.ds2
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 037aafa5ae6a5b87779bce247c455fae4ec9ab57
Merge: b64540b818d6974e076ac7e3cbdf0272acfd0c37 c6eae1602612d782295a709f94c094e440120a8d
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Apr 27 01:14:02 2015 +1000

    Merge tag 'upstream/1.5.2.ds2'
    
    Upstream version 1.5.2.ds2
    
    # gpg: Signature made Mon 27 Apr 2015 01:13:56 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