[SCM] devede/master: Merge tag 'upstream/4.0_ds1'

[alessio at users.alioth.debian.org]

Imported Upstream version 4.0~ds1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 2d0f4a7442e487e1b8aa057a10d587c2585db0de
X-Git-Newrev: 35418fbed2369a9dc5250f4ff2e30fcb1bd6c2f1

The following commit has been merged in the master branch:
commit 35418fbed2369a9dc5250f4ff2e30fcb1bd6c2f1
Merge: 0b65fd9f8db08b68689174c6589387e1b3a14e40 de32f6ef45d08b4d0a055030773621a04f2d9ccd
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Wed Apr 29 12:27:53 2015 +0100

    Merge tag 'upstream/4.0_ds1'
    
    Upstream version 4.0~ds1


-- 
devede packaging