From: Remi Collet <remi@php.net>
Date: Tue, 10 Jun 2014 08:32:26 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.14RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d440bb3e6854070f3b0a02b0d73b9b06065959af;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  NEWS
  Fixed bug #67406 built-in web-server segfaults on startup
---

d440bb3e6854070f3b0a02b0d73b9b06065959af