Merge branch 'vendor/ZLIB'
authorJohn Marino <draco@marino.st>
Fri, 11 May 2012 14:41:18 +0000 (16:41 +0200)
committerJohn Marino <draco@marino.st>
Fri, 11 May 2012 14:41:18 +0000 (16:41 +0200)

Trivial merge