]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3efc9f2 bcc15b5)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Fri, 23 Mar 2012 05:31:10 +0000 (22:31 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 23 Mar 2012 05:31:10 +0000 (22:31 -0700)
* PHP-5.4:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  update for git


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.