From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Apr 2014 22:48:33 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~375
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ae2328c445f26f757fa84b98c7047a5fda2f50b;p=php

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
---

0ae2328c445f26f757fa84b98c7047a5fda2f50b