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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.7~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: 506da1acb7ab8a8c084dc7834d9f0d9f249836f6
X-Git-Newrev: 999cdca51b5318bb77b05f6416fa6627ac05f3c8

The following commit has been merged in the master branch:
commit fb47ae0ddee945f0b4a90d98894a23a46dd6e484
Merge: 506da1acb7ab8a8c084dc7834d9f0d9f249836f6 6cf814c792081221080b2b21d624f1d93ed54cb2
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Feb 14 11:44:57 2015 +0000

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


-- 
lives packaging