From: Christopher Jones <sixd@php.net>
Date: Tue, 25 Jun 2013 20:25:04 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c3f4cc2e402c0b14ecc59e2cddc813a9c72bddcf;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
---

c3f4cc2e402c0b14ecc59e2cddc813a9c72bddcf