From: Xinchen Hui <laruence@php.net>
Date: Sat, 21 Apr 2012 08:03:53 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~277
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5ffe5d471f12235712cfba3b6199856255aed656;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fix test
  - BFN
---

5ffe5d471f12235712cfba3b6199856255aed656