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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix test - on CI somebody could create a process in the meantime
---

bfbb409b32493d7510a943c1201caa89484a0f65