]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
authorChristopher Jones <sixd@php.net>
Wed, 19 Sep 2012 01:31:05 +0000 (18:31 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 19 Sep 2012 01:31:05 +0000 (18:31 -0700)
commit40afaa957b0c197bc9c8ba8a53eb2a261ad73a1c
tree7aa0996788e65d40f6c43766f033f895f5f5de5a
parentf1af61de0bdd4fa00a8545b9ed69ba928bf54f3f
parent6752f38ccca37213865f330a2f0dc49d834dc92e
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3

* 'PHP-5.3' of https://git.php.net/repository/php-src:
  updated libary versions
  split tests for the new zlib version on win
  Fixed Bug #63103 (ext\curl\tests\bug62839.phpt broken)