]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: df499b9 4c34d57)
Merge branch 'PHP-5.6'
authorJulien Pauli <jpauli@php.net>
Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)
committerJulien Pauli <jpauli@php.net>
Tue, 7 Jul 2015 14:03:37 +0000 (16:03 +0200)
* PHP-5.6:
  Fix test related to c22da81

Conflicts:
ext/standard/tests/general_functions/bug41037.phpt


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