From: Christopher Jones <sixd@php.net>
Date: Fri, 16 Nov 2012 03:29:48 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4
X-Git-Tag: php-5.4.10RC1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=975fb4e3eaa7ef5538618e5bd79776bef0131598;p=php

Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

* 'PHP-5.4' of https://git.php.net/repository/php-src:
  Skip test if directory does not exist
  Fixed test sapi/cli/tests/006.phpt
  Fixed compiler reenterability
  Fixed compiler reenterability
  UPdated NEWS
  Updated NEWS
---

975fb4e3eaa7ef5538618e5bd79776bef0131598