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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.2.4~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: 82acc05b72dc6279b13d025b8325c0f996925881
X-Git-Newrev: 41b3b71271f5186d4b76e85c90abe43dbb78f10c

The following commit has been merged in the master branch:
commit 964e0d9002a73f66df8128cb2e7881c09c7eeb2e
Merge: 82acc05b72dc6279b13d025b8325c0f996925881 24a9ca16f4d1e1c8a7386b8b27854fd548a0189e
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 22 11:23:19 2014 +0100

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


-- 
lives packaging