From: Johannes Schlüter <johannes@php.net>
Date: Thu, 19 Apr 2012 10:48:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.4.4RC1~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36a556546737c5218cd649c9a5ae8b1a10aa2d49;p=php

Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:
---

36a556546737c5218cd649c9a5ae8b1a10aa2d49