[SCM] cantata/master: Merge tag 'upstream/2.0.0+ds1'

[stuart at users.alioth.debian.org]

Imported Upstream version 2.0.0+ds1
Imported Upstream version 2.0.0+ds1
Imported Upstream version 2.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f4633db73701ce5148e367e3f08f8ab5ed672c0
X-Git-Newrev: 53abf148e3d79fa65e39941a51bbcf7c3cbe0c05

The following commit has been merged in the master branch:
commit 05efb5dcb2a80af323e6f104590ae52209f972b1
Merge: 631c04a8d6efc3e38cfa399b628d735a1aabb4fb 218c81bcb6c6eb85d2f2f664eb13fa048355626b
Author: Stuart Prescott <stuart at debian.org>
Date:   Mon Feb 8 01:26:57 2016 +1100

    Merge tag 'upstream/2.0.0+ds1'
    
    Upstream version 2.0.0+ds1
    
    # gpg: Signature made Mon 08 Feb 2016 01:26:45 AEDT 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