[SCM] zita-convolver/master: Resolving merge

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

Imported Upstream version 3.0.2
Purge debian directory from upstream branch.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: bdb5465858a1b81ec045ad39b1d5c7fe18a047b6
X-Git-Newrev: 23bea42617a9e536a0d5ca7380bc4235f024fb91

The following commit has been merged in the master branch:
commit 23bea42617a9e536a0d5ca7380bc4235f024fb91
Merge: bdb5465858a1b81ec045ad39b1d5c7fe18a047b6 107ca8e2bd24ad1c9f41f677bb4bcd842ca91853
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Wed Oct 19 23:42:55 2011 +0200

    Resolving merge


-- 
zita-convolver packaging