From: Johannes Schlüter <johannes@php.net>
Date: Wed, 12 Sep 2012 21:05:24 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~34^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fa014e07bfe1599b9b5dc1cbea9d242126ae1995;p=php

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

fa014e07bfe1599b9b5dc1cbea9d242126ae1995