[SCM] zita-resampler/master: Merge commit 'upstream/1.1.0'

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

Imported Upstream version 1.1.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: de313e711e953ae03474194255eafe68f6606b35
X-Git-Newrev: 31ab0b31f42f7af6024264059ca299ba5fa63c6e

The following commit has been merged in the master branch:
commit 31ab0b31f42f7af6024264059ca299ba5fa63c6e
Merge: de313e711e953ae03474194255eafe68f6606b35 b38f82d6169b77b8e95c63e86c6d932d8017449d
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Jan 28 12:55:45 2012 +0100

    Merge commit 'upstream/1.1.0'


-- 
zita-resampler packaging