[SCM] audacity/master: Merge branch 'upstream'

[bdrung at users.alioth.debian.org]

Fix wrong line endings of source files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 4e5f49975d8d61335b9b2cf701ea686927b0b4bc
X-Git-Newrev: 093b334e52b3f915b9f3c74bbb885c5a47524422

The following commit has been merged in the master branch:
commit 093b334e52b3f915b9f3c74bbb885c5a47524422
Merge: 6ae586349c1022d1ea011e2828db002100099b40 f2f33fb38a1384c0bd6d761e4ccbf06e85d8476d
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Oct 13 23:17:34 2014 +0200

    Merge branch 'upstream'


-- 
Audacity debian packaging