[SCM] multicat/master: Merge commit 'upstream/2.0'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.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: e6abad609de51e13cf8e775bc1d7ebe3963b2ad3
X-Git-Newrev: d9c66db3c6c62b5664b69f9a28077dc83be630c6

The following commit has been merged in the master branch:
commit d9c66db3c6c62b5664b69f9a28077dc83be630c6
Merge: e6abad609de51e13cf8e775bc1d7ebe3963b2ad3 10fe70163bbac336416e1dba268d998f5d3f37a8
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 15 15:50:15 2012 +0100

    Merge commit 'upstream/2.0'


-- 
multicat packaging