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

Merge branch 'PHP-5.4'
---

a9836496e3abdcd3f6069f2d525e1e5c98b303c9