From: Felipe Pena <felipensp@gmail.com>
Date: Wed, 26 Jun 2013 00:44:03 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b68c49617517d26abca3ec971a418e67f595010f;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
---

b68c49617517d26abca3ec971a418e67f595010f