]> granicus.if.org Git - php/commit
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)
commit455f3de80267b68fc4d319275c3ca1cc46a44bb3
treedf2c6673a8fe79b84d3e6b906909b0617d6cb3a1
parent6bfea28ce31e66f467cf2ee85e032e33eb992772
parent53ba768ed8f2d2654db80e5e729903957863434e
Merge branch 'PHP-5.4'

* PHP-5.4:
  removed unneccesary arrat and ini settings
  addition SplFileObject tests
  new tests from PHP TestFest June 2012