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)
commit16af0f092dae141e5c1a872d944a85c780dbd3cc
tree2922ed664a13d8536d88aaff38c587a7b3414518
parent14345dee221452daaffa6ed45f6de76c0c6f227e
parenta530a2677fa709244d0eff2f3bae634cf73876c9
Merge branch 'vendor/XZ'