]> granicus.if.org Git - php/commit
Merge branch '5.3' into 5.4
authorAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 16:16:02 +0000 (18:16 +0200)
committerAnatoliy Belsky <ab@php.net>
Tue, 27 Mar 2012 16:16:02 +0000 (18:16 +0200)
commitb7596eaa1b406f7d768e49c53f03bb7cdfa25cab
treefd41dde051f02ee4d7cf8af9f9406ed08d8ac278
parent8d7a489b97eb436a5e99c008e57fdb068c86ec67
parentbcfcfb2fc5f358ebfdc76a773b20b3fc056b20c0
Merge branch '5.3' into 5.4

* 5.3:
  Fix bug #61519 test fails, should pass - ext/zlib/tests/bug60761.phpt

Conflicts:
ext/zlib/tests/bug60761.phpt
ext/zlib/tests/bug60761.phpt