]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 22:48:33 +0000 (15:48 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 22:48:33 +0000 (15:48 -0700)
* PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime


Trivial merge