[SCM] ardour3/master-a4: Merge tag 'upstream/4.2_dfsg' into master-a4

[adiknoth-guest at users.alioth.debian.org]

Imported Upstream version 4.2~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master-a4
X-Git-Reftype: branch
X-Git-Oldrev: f61fb83404995de86fba113be40298d714f85043
X-Git-Newrev: 08c18547ed8462b74cb2aee73b373f9bfdb00894

The following commit has been merged in the master-a4 branch:
commit ff548d2562030ebfd0702f44b660cb975ff373df
Merge: f61fb83404995de86fba113be40298d714f85043 a95ebd2999ad86cb170e8d371dbccc64b36d474d
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date:   Sun Aug 23 21:59:33 2015 +0200

    Merge tag 'upstream/4.2_dfsg' into master-a4
    
    Upstream version 4.2~dfsg


-- 
ardour3 packaging