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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.5~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: 4d053b930484237cc16157811e9b1d4db4529f65
X-Git-Newrev: e44912840295f8a95f010d590e9c42f69151839d

The following commit has been merged in the master branch:
commit a8067044807ebd533320b7dbc056835249ce0d34
Merge: 4d053b930484237cc16157811e9b1d4db4529f65 b0af84be2209dbc6cbb9752e774739cb54a7d051
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jul 6 12:07:11 2014 +0100

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


-- 
lives packaging