]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:42:21 +0000 (00:42 -0800)
committerStanislav Malyshev <stas@php.net>
Thu, 5 Feb 2015 08:42:21 +0000 (00:42 -0800)
* PHP-5.6:
  fix test to not hit php.net
  fix test to not hit php.net


Trivial merge