[SCM] csound/master: Merge branch 'upstream6' into debian6

[fsateler at users.alioth.debian.org]

Imported Upstream version 6.00~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 903a6f35ef21f5e842d1289f2fc89f5af8c8476d
X-Git-Newrev: 21e0e7a9e1787dc52b69ba7272ed5a36f5720bf3

The following commit has been merged in the master branch:
commit 50f7480ccd7ce4397b67eec2c090303a05f03ac8
Merge: 4078cf008f9cbbea280d7934834210d8a36d42a7 b6571b1ab2a01e1e2ecab05ad4196178cfafe6cf
Author: Felipe Sateler <fsateler at debian.org>
Date:   Fri Jul 12 19:51:48 2013 -0400

    Merge branch 'upstream6' into debian6


-- 
csound packaging