[SCM] lives/master: Merge tag 'upstream/2.0.6_ds0'

[alessio at users.alioth.debian.org]

Imported Upstream version 2.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: 5c416ca67429018d0a7568e8ef8386cdfbea3ffe
X-Git-Newrev: 387b80ba56393dc30c2bc38ab68e102ba4cbf650

The following commit has been merged in the master branch:
commit 387b80ba56393dc30c2bc38ab68e102ba4cbf650
Merge: 5c416ca67429018d0a7568e8ef8386cdfbea3ffe bc07a34d2cec8dcddbc962b2ac32c9aca9594a92
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Oct 8 10:08:28 2013 +0100

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


-- 
lives packaging