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

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

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

The following commit has been merged in the master branch:
commit 82cbbee77281b636f82ce4135d6e741aabec86a8
Merge: d29068ebe5ac49e27e32a4ac52610a613b0a0b7f c272256342b067ed0bd1300ef64dafae8d466486
Author: Daniel James <daniel at 64studio.com>
Date:   Mon Aug 8 15:48:07 2016 +0100

    Merge tag 'upstream/1.6-beta2'
    
    Upstream version 1.6-beta2


-- 
xwax packaging