[SCM] xwax/master: Merge tag 'upstream/1.5'

[alessio at users.alioth.debian.org]

Imported Upstream version 1.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 12b6ee1ce907fe2588967ddfae82cefd1d10e0ff
X-Git-Newrev: 65706fc376a975a82ed2e4fc3aef0dd45e670da6

The following commit has been merged in the master branch:
commit d8f7a9ece18aac8f79a0c2024ca71ea7ff21b520
Merge: 12b6ee1ce907fe2588967ddfae82cefd1d10e0ff f7d930dfa820ae86cb85b8ba09215e4e795254fc
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Apr 10 15:18:08 2014 +0100

    Merge tag 'upstream/1.5'
    
    Upstream version 1.5


-- 
xwax packaging