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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.0~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: 5aa82b9c3ff51a0d23d58cfa2c3d0b5fbb33197c
X-Git-Newrev: e558c00c5c6989d8558c635e42cc2e623638f680

The following commit has been merged in the master branch:
commit f8639060fcb51cd3e38d1f2173f346daedd48d2e
Merge: 5aa82b9c3ff51a0d23d58cfa2c3d0b5fbb33197c 1cdd5cf67f1b64327e2ada04b338bd719212d7bf
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Dec 2 09:31:59 2013 +0000

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


-- 
lives packaging