Merge branch 'master' of http://git.tukaani.org/xz into jn/abi2