]> granicus.if.org Git - php/commit
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)
commit0ae2328c445f26f757fa84b98c7047a5fda2f50b
tree076f7bbbaefcb6d3a6e57a3bd6d03709268757f4
parent46070e956cf3bec9cc0fafb75701f196b7b9d3c3
parentbfbb409b32493d7510a943c1201caa89484a0f65
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test - doesn't seem to produce warning
  Fix test - on CI somebody could create a process in the meantime