]> granicus.if.org Git - php/commitdiff
Merge branch 'phpng' of git.php.net:php-src into phpng
authorDmitry Stogov <dmitry@zend.com>
Fri, 30 May 2014 07:13:19 +0000 (11:13 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 30 May 2014 07:13:19 +0000 (11:13 +0400)
* 'phpng' of git.php.net:php-src:
  typo
  Revert "Fix ArrayObject with immutable array"
  Fix ArrayObject with immutable array


Trivial merge