]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d893814 4636117)
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 08:09:44 +0000 (00:09 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 1 Feb 2015 08:09:44 +0000 (00:09 -0800)
* PHP-5.6:
  Fix bug #64938: libxml_disable_entity_loader setting is shared between threads

Conflicts:
ext/libxml/libxml.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.