]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:/php-src
authorJoe Watkins <krakjoe@php.net>
Sun, 13 Nov 2016 05:40:49 +0000 (05:40 +0000)
committerJoe Watkins <krakjoe@php.net>
Sun, 13 Nov 2016 05:40:49 +0000 (05:40 +0000)
1  2 
ext/xml/compat.c

Simple merge