From: Anatoliy Belsky <ab@php.net>
Date: Sun, 6 May 2012 16:06:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~232^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=692cc976ca6860400a0538835d5be8249eaf8f60;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix bug 61769 Random failure of php_cli_server*phpt tests
---

692cc976ca6860400a0538835d5be8249eaf8f60