[SCM] muse/master: Merge tag 'upstream/2.1'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.1
Imported Upstream version 2.1~rc2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d9bed5f1a1cb328dd741140dedbb00e399437d28
X-Git-Newrev: 6f476c4cab5be75e11d99cad2c98ee439eb552c3

The following commit has been merged in the master branch:
commit 2e9a8b8f75fb6b42c2e0578054476a4d5f2cb07d
Merge: d9bed5f1a1cb328dd741140dedbb00e399437d28 b3842758c45ca1674278e8253fda023f50f42130
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 7 10:25:20 2013 +0000

    Merge tag 'upstream/2.1'
    
    Upstream version 2.1


-- 
muse packaging