[SCM] laborejo/master: Merge tag 'upstream/0.6_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.6~ds0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2f4da481ff8aed5f945711113cd3f1320f41f6b6
X-Git-Newrev: 24797b8890885bdd0294c438fc4a0c804fe11c29

The following commit has been merged in the master branch:
commit 24797b8890885bdd0294c438fc4a0c804fe11c29
Merge: 0263746c79ece6d4c58798d7809a938ad9053164 05497c2e219bdaa2caefab744d6f85fadfab321e
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 4 11:11:39 2013 +0100

    Merge tag 'upstream/0.6_ds0'
    
    Upstream version 0.6~ds0


-- 
laborejo packaging