[SCM] lives/master: Merge tag 'upstream/2.0.0_ds0' into master.experimental

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0.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: 2db1f867b498fbb0fcf5101ef4884df582a79867
X-Git-Newrev: f442365a62dc138bbf7e635e3cc48612756472f0

The following commit has been merged in the master branch:
commit 2e2e3867c59aaf6547b9728a312356d8b996064c
Merge: e5f12993efcec412159337efebdab1889610c839 aabff8655b7de2849f27dbfb877ff8d9f8529afa
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Apr 7 15:33:29 2013 +0100

    Merge tag 'upstream/2.0.0_ds0' into master.experimental
    
    Upstream version 2.0.0~ds0


-- 
lives packaging