[SCM] audacity/master: Merge tag 'upstream/2.1.1'

[bdrung at users.alioth.debian.org]

Imported Upstream version 2.1.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 857f34812d7e5afa3efeb6363a3f3e1c3dabbdb4
X-Git-Newrev: 2e7bfeefa45cfa61e2f262265c1590346febde2a

The following commit has been merged in the master branch:
commit 2e7bfeefa45cfa61e2f262265c1590346febde2a
Merge: 857f34812d7e5afa3efeb6363a3f3e1c3dabbdb4 8d595792c2d9981e85576cfc90de8a74a668db9b
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Aug 17 13:40:40 2015 +0200

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1


-- 
Audacity debian packaging