]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86674b5 86966a0)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:18:51 +0000 (00:18 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 23 Aug 2014 22:18:51 +0000 (00:18 +0200)
* PHP-5.6:
  this test depends on the simplexml ext, not just on xml

Conflicts:
ext/simplexml/tests/bug62328.phpt


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