]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1'
authorJoe Watkins <krakjoe@php.net>
Wed, 25 Jan 2017 20:59:52 +0000 (20:59 +0000)
committerJoe Watkins <krakjoe@php.net>
Wed, 25 Jan 2017 20:59:52 +0000 (20:59 +0000)
* PHP-7.1:
  Fix bug #54382 (getAttributeNodeNS doesn't get xmlns* attributes)
  Added (failing) testcase for bug #54382


Trivial merge