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

[alessio at users.alioth.debian.org]

Imported Upstream version 1.6~beta1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 65706fc376a975a82ed2e4fc3aef0dd45e670da6
X-Git-Newrev: 1c85985adf57596ccd89b8d2464737956b12f5f2

The following commit has been merged in the master branch:
commit a20b698b24cbb8cdca270128fb94e6a587b74ddf
Merge: 65706fc376a975a82ed2e4fc3aef0dd45e670da6 7bcff24cce7e1b9ad03351fbdfe8b04bbaa5f270
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Wed Jun 10 12:24:10 2015 +0100

    Merge tag 'upstream/1.6_beta1'
    
    Upstream version 1.6~beta1


-- 
xwax packaging