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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.4.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: 999cdca51b5318bb77b05f6416fa6627ac05f3c8
X-Git-Newrev: 52cbe9b1c39ea877252ed530b876bf68482eb970

The following commit has been merged in the master branch:
commit 52cbe9b1c39ea877252ed530b876bf68482eb970
Merge: 999cdca51b5318bb77b05f6416fa6627ac05f3c8 fbe29da1b9f7f34ec87e54246e6ddaec7a1d4ad6
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Fri May 8 16:36:57 2015 +0100

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


-- 
lives packaging