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

[dhj-guest at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit bee431f3a5055b4cd455c2d8a164cb9dce0265ba
Merge: ee27698b3abfed1810e0a245d687d7f9e021bfa1 2f6186ce1eedfc4351b21d3a44e25e6328f1df98
Author: Daniel James <daniel at 64studio.com>
Date:   Mon Aug 15 11:13:33 2016 +0100

    Merge tag 'upstream/1.6'
    
    Upstream version 1.6


-- 
xwax packaging