]> granicus.if.org Git - php/commitdiff
Merge branch 'PHp-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 14 Apr 2015 07:49:23 +0000 (00:49 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 14 Apr 2015 07:49:23 +0000 (00:49 -0700)
* PHp-5.4:
  fix non-standard C

1  2 
ext/dom/document.c

Simple merge