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

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 5275d490d077686fa05a55188119633f46f8227e
Merge: a1633ba07ccdb3b3171d1463d50cfd7df854c8f0 c20851baf4294fe3481b1c4e596d417ab22ff1f5
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 3 13:06:21 2011 +0100

    Merge commit 'upstream/1.1.1_dfsg0'


-- 
dssi packaging