From: Gustavo André dos Santos Lopes <cataphract@php.net>
Date: Tue, 17 Jul 2012 21:13:43 +0000 (+0200)
Subject: Merge branch '5.4'
X-Git-Tag: php-5.5.0alpha1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08302e3d0365fd269e4d66a18512f4c97180e379;p=php

Merge branch '5.4'

* 5.4:
  NEWS for b47d6b32
  Fix test fails: ext/standard/tests/general_functions/bug27678.phpt
---

08302e3d0365fd269e4d66a18512f4c97180e379