Merge "testPngNativetZtxt requires zlib extension"
authorGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Jan 2013 11:24:17 +0000 (11:24 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 28 Jan 2013 11:24:17 +0000 (11:24 +0000)

Trivial merge