]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Sun, 15 Jul 2012 02:25:16 +0000 (19:25 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 15 Jul 2012 02:25:16 +0000 (19:25 -0700)
* PHP-5.4:
  removed unneccesary arrat and ini settings
  addition SplFileObject tests
  new tests from PHP TestFest June 2012


Trivial merge