Merge branch 'vendor/XZ'
authorJohn Marino <draco@marino.st>
Fri, 10 Oct 2014 19:14:07 +0000 (21:14 +0200)
committerJohn Marino <draco@marino.st>
Fri, 10 Oct 2014 19:14:07 +0000 (21:14 +0200)

Trivial merge