[SCM] rosegarden/master: Merge tag 'upstream/14.12'

[stuart at users.alioth.debian.org]

Imported Upstream version 14.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 51eb36b7d7475e9dee671993c00429baf683641a
X-Git-Newrev: 273c2a96ef38d3428d0b00efd10aac5d5ab1a7fd

The following commit has been merged in the master branch:
commit b0f7902bf2af35430b60af396c10db2938e4002e
Merge: 51eb36b7d7475e9dee671993c00429baf683641a f013e9351d9b51ec7ea238ff28864a3ae7acedaf
Author: Stuart Prescott <stuart at debian.org>
Date:   Tue Apr 28 00:23:47 2015 +1000

    Merge tag 'upstream/14.12'
    
    Upstream version 14.12
    
    # gpg: Signature made Tue 28 Apr 2015 00:23:41 AEST 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>"


-- 
rosegarden packaging