[SCM] dssi/master: Merge commit 'upstream/1.1.1'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit f82625b0b93c29ade8b1517c84e90e3ce56a67b0
Merge: b30087cd7d4c20831d1c27cbea94f1024446d1b2 82287e0d8afc2f89c35e31091a1c4447bf6f28d9
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Oct 28 16:21:46 2011 +0200

    Merge commit 'upstream/1.1.1'


-- 
dssi packaging