]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 18:33:41 +0000 (21:33 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Sun, 17 Aug 2014 18:33:41 +0000 (21:33 +0300)
* PHP-5.4:
  Correct typo in comments: 'initialized'

1  2 
ext/dom/php_dom.c
ext/spl/php_spl.c

Simple merge
Simple merge