[SCM] idjc/master: Merge commit 'upstream/0.8.5'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 3492036b8547b6c9925e38b5ee03065c9279d2a1
Merge: f6c910076de70c9b0307a11bd846db6f76014c6e 82948fadf4db8600b75113a35f70e2154e4397b5
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 11 09:31:55 2011 +0200

    Merge commit 'upstream/0.8.5'


-- 
idjc packaging