From: Michael Wallner <mike@php.net>
Date: Tue, 24 Apr 2012 18:43:59 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=edbd958815bddfed6dd307026760284e0becfc21;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  BFN
---

edbd958815bddfed6dd307026760284e0becfc21