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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.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: d8537ef814f795db7b9790541969b02e4e44b250
X-Git-Newrev: 8247b0456398311a830f88e8878ed29161986a24

The following commit has been merged in the master branch:
commit 8247b0456398311a830f88e8878ed29161986a24
Merge: d8537ef814f795db7b9790541969b02e4e44b250 1db8e5d1e23daa1ef9a77c8b11faa2f8ab6ceb3d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 19 08:00:40 2014 +0100

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


-- 
lives packaging