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

[alessio at users.alioth.debian.org]

Imported Upstream version 2.0.5~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: d5d1b3996e0678c27670a771ffcac7560c0db1c8
X-Git-Newrev: e1a61f90fdd17e008419b26a3bb553174a5dcbb9

The following commit has been merged in the master branch:
commit e1a61f90fdd17e008419b26a3bb553174a5dcbb9
Merge: d5d1b3996e0678c27670a771ffcac7560c0db1c8 026b7e098dcf9b8b9ca87ce6e1ba799b13cb1c86
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jun 28 00:59:08 2013 +0100

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


-- 
lives packaging