Merge branch 'vendor/ZLIB'
authorJohn Marino <draco@marino.st>
Wed, 8 May 2013 19:37:49 +0000 (21:37 +0200)
committerJohn Marino <draco@marino.st>
Wed, 8 May 2013 19:37:49 +0000 (21:37 +0200)

Trivial merge