]> granicus.if.org Git - php/commitdiff
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)
* '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)


Trivial merge