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

[stuart at users.alioth.debian.org]

Imported Upstream version 1.3.4.ds1
Imported Upstream version 1.3.4.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: 6f5e732093b007a01e6daf65e949c124c52ba252
X-Git-Newrev: f6372bbf75a7e1b64c6bb1106fc96aa4f5e68137

The following commit has been merged in the master branch:
commit f48142144923ec9b6d95cf4b9791a4f77456775a
Merge: 4acdcc4c89298b3da2d42e6984afde44481fb839 2ff85d3317cbfd186993dce1f046343bd4fdd6af
Author: Stuart Prescott <stuart at debian.org>
Date:   Wed May 14 20:43:51 2014 +1000

    Merge tag 'upstream/1.3.4.ds1'
    
    Upstream version 1.3.4.ds1
    
    # gpg: Signature made Wed 14 May 2014 20:43:46 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