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

[sramacher at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 6ce9a73f5f3d49280b6e1c48d5b81d76bea0d320
Merge: 21116ec8de40bcdb57697fd99db876e374a86a44 db4681ed0ecf148cc6d1461fcc6fcd8bdccb7a57
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sat Sep 14 12:57:08 2013 +0200

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4


-- 
Audacity debian packaging