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

[stuart at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit aba06acd688397f33a1864e9df60818d579d2c1b
Merge: 6f5e732093b007a01e6daf65e949c124c52ba252 e993233ef72a3aa39c3c2310d120ccc36ba51fe8
Author: Stuart Prescott <stuart at debian.org>
Date:   Fri Jan 17 23:03:51 2014 +1100

    Merge tag 'upstream/1.2.2.ds1'
    
    Upstream version 1.2.2.ds1
    
    # gpg: Signature made Fri 17 Jan 2014 23:03:46 EST using DSA key ID 71C5D1A8
    # gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart+debian at nanonanonano.net>"
    # gpg:                 aka "Stuart Prescott <stuart.prescott at bristol.ac.uk>"
    # gpg:                 aka "Stuart Prescott <stuart at debian.org>"


-- 
cantata packaging