[SCM] soundconverter/upstream: Merge branch 'upstream' into upstream.experimental

[sramacher at users.alioth.debian.org]

Imported Upstream version 2.1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 86149f853552914862717e170661b70e415fbc00
X-Git-Newrev: aa4c2736d4721ab134ea38021068267ac45cfd13

The following commit has been merged in the upstream branch:
commit aa4c2736d4721ab134ea38021068267ac45cfd13
Merge: e308ebbcb2f93c1ea19dca1d95a21eea80ab5e1a 86149f853552914862717e170661b70e415fbc00
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon Oct 12 00:11:32 2015 +0200

    Merge branch 'upstream' into upstream.experimental


-- 
soundconverter packaging