]> granicus.if.org Git - php/commit
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)
commit2e19cccad7b3deb466910cec1a95976e25d575db
tree81eda1330a1de42c32f286fe7b2dbeb68b03bb4b
parent3efc9f2f7895520bbf0e09992ca9906a8c2fa722
parentbcc15b56331f3055c99d8c126a61f48b33229c1c
Merge branch 'PHP-5.4'

* PHP-5.4:
  Revert "- Fixed bug #61418 (Segmentation fault when DirectoryIterator's or" - causes bug #61482
  update for git