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

[stuart at users.alioth.debian.org]

Imported Upstream version 1.4.0.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: f6372bbf75a7e1b64c6bb1106fc96aa4f5e68137
X-Git-Newrev: 66a9e26e9149295e34f6cf9488357599be5c1dbf

The following commit has been merged in the master branch:
commit a67300fc460359e15e4a552af77315aca810d613
Merge: 5e34bb1603650dfc331f935a1489fd9924b007c9 2bd5870bf449086c8564c0f54c78d67dac4831a8
Author: Stuart Prescott <stuart at debian.org>
Date:   Sun Aug 10 23:34:05 2014 +1000

    Merge tag 'upstream/1.4.0.ds1'
    
    Upstream version 1.4.0.ds1
    
    # gpg: Signature made Sun 10 Aug 2014 23:34:04 EST 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