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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c03cec310c448c28274c449228de29d42fefde34
X-Git-Newrev: 8fe5cab098704dc33e21894f5236c1055146e067

The following commit has been merged in the master branch:
commit 8fe5cab098704dc33e21894f5236c1055146e067
Merge: b66b14da10d9de62b1bec9cce10abcc18668f12b c469e698ae1776752dd85f93a86c11e57403f3c3
Author: Alessio Treglia <alessio at debian.org>
Date:   Sun Jun 30 03:41:16 2013 +0100

    Merge tag 'upstream/1.4'
    
    Upstream version 1.4


-- 
xwax packaging