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

[alessio at users.alioth.debian.org]

Imported Upstream version 12.04
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: e837631518f248ce49849b0f23aa2decf72a1ce8
X-Git-Newrev: b7726d5cdc3503d5894c535169ba36ee55c5885e

The following commit has been merged in the master branch:
commit b7726d5cdc3503d5894c535169ba36ee55c5885e
Merge: e837631518f248ce49849b0f23aa2decf72a1ce8 8e6e642f41f70afdbff12e801dc91defadcfbc71
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun May 13 23:40:41 2012 +0200

    Merge tag 'upstream/12.04'
    
    Upstream version 12.04


-- 
rosegarden packaging