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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0.2~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 ba0a6457040d44450b4d52330af0f0b448fea4fd
Merge: 34647999d547aee2c9a88ce4ee4e40df7777f586 31e708558b94df9ee4e29238a7ba096668c98f42
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 8 00:37:56 2013 +0100

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


-- 
lives packaging