[SCM] lives/master: Merge tag 'upstream/1.6.3_ds1' into master.experimental

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 1d1da2225f13bc31a1c1a3b4c6bc9c9cf2c0bc51
Merge: 2abbcbe1fd906f8721115dda81c40da75588c828 3a2baa12fa178e63c2317170a35e7963e006d59b
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 21 12:37:40 2012 +0200

    Merge tag 'upstream/1.6.3_ds1' into master.experimental
    
    Upstream version 1.6.3~ds1


-- 
lives packaging