Merge branch 'vendor/XZ'
authorJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 12:13:43 +0000 (13:13 +0100)
committerJohn Marino <draco@marino.st>
Tue, 3 Nov 2015 12:13:43 +0000 (13:13 +0100)
commit4381ed9d7ee193d719c4e4a94a9d267d177981c1
treeb3fb5310e3b6679fd882132b38886f55ced0a632
parent7c5aac383b0dbd8a84bf44798d645cdcb9a7ab4b
parent15ab8c86fa7d7412b1f3ff9d000f266de730a6fd
Merge branch 'vendor/XZ'