[SCM] ardour3/master-a4: Resolve merge.

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

Imported Upstream version 4.0~dfsg1
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: a7335d52eb8f64a62932a599267330dbd4949abb
X-Git-Newrev: fce67ac4a1c78ce07dc3f0bb821572e5b4866d79

The following commit has been merged in the master-a4 branch:
commit fce67ac4a1c78ce07dc3f0bb821572e5b4866d79
Merge: a7335d52eb8f64a62932a599267330dbd4949abb 1a45b3d884d7becd7dc9dba084253ca5ee882bcf
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue May 5 00:48:47 2015 +0200

    Resolve merge.


-- 
ardour3 packaging