]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d33f4c6 10b15f0)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:41:55 +0000 (00:41 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:41:55 +0000 (00:41 -0800)
* PHP-5.5:
  fix test to not hit php.net


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