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

[stuart at users.alioth.debian.org]

Imported Upstream version 1.4.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: 66a9e26e9149295e34f6cf9488357599be5c1dbf
X-Git-Newrev: 05199489defe2153c420c87ac615c796b565ea36

The following commit has been merged in the master branch:
commit fd8344cbe6ce968b8f861157112eb188db43060b
Merge: 66a9e26e9149295e34f6cf9488357599be5c1dbf 293b991233b4f64d7077a2a3b643be83ff796bf2
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Sep 29 20:53:42 2014 +1000

    Merge tag 'upstream/1.4.2.ds1'
    
    Upstream version 1.4.2.ds1
    
    # gpg: Signature made Mon 29 Sep 2014 20:53:36 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