[SCM] calf/master: mergeconflict

[js at users.alioth.debian.org]

tiny problems
merge-conflict
mute output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6a3c1a63a147948535a50da009275278ad5e6a3
X-Git-Newrev: 34569260c452f0fa4c543155ebba174a42a343dc

The following commit has been merged in the master branch:
commit 2aa92dc555beb21749b6c232916dfdfccf9d4155
Merge: 2c81cdae47a8e9f84a510d7f905003698037b882 a3708fd1d503f2dce5c2f0e4bb6e12fb01663052
Author: Christian Holschuh <chrisch.holli at gmx.de>
Date:   Tue Mar 6 06:16:21 2012 +0100

    mergeconflict


-- 
calf audio plugins packaging