]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f81c312 2cbc405)
Merge branch 'PHP-5.3' of https://git.php.net/repository/php-src into PHP-5.3
authorChristopher Jones <sixd@php.net>
Wed, 26 Sep 2012 23:31:14 +0000 (16:31 -0700)
committerChristopher Jones <sixd@php.net>
Wed, 26 Sep 2012 23:31:14 +0000 (16:31 -0700)
commitbf50416744be29910ee85360a7f77da4073e82bf
treeb1b5d392df6f85618e8f6241d89ed5a584636813tree | snapshot
parentf81c3129453a54f400be0b23b2a060649aead794commit | diff
parent2cbc4053ae33245f8e13502ed289292aee19ef36commit | diff
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:
  Correct the test summary
  Fixed bug #60723 (error_log error time has changed to UTC ignoring default timezo)
  Avoid calling select if maxfd returned by curl_multi_fdset is -1
  Fixed bug #63111 (is_callable() lies for abstract static method)
  updated lib versions
Unnamed repository; edit this file 'description' to name the repository.