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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.3~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: e22049c8e754fe3b869b43702e4c44f67875fae0
X-Git-Newrev: f02e99ca1b3a8b76989c231a2d4f9685e3acde4c

The following commit has been merged in the master branch:
commit f02e99ca1b3a8b76989c231a2d4f9685e3acde4c
Merge: e22049c8e754fe3b869b43702e4c44f67875fae0 5a1ded53961f871541db30b3f08106acbbc6fa63
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 13 23:31:11 2014 +0100

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


-- 
lives packaging