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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.2~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: e558c00c5c6989d8558c635e42cc2e623638f680
X-Git-Newrev: 571a330b01ccded0e909a323ba717f95a38a3d27

The following commit has been merged in the master branch:
commit 060ce75134115718fa99fcf02b58ad92dc9daa26
Merge: e558c00c5c6989d8558c635e42cc2e623638f680 0d8c120ab81c190266463278b268c1a763a53770
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Mar 8 15:04:33 2014 +0000

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


-- 
lives packaging