From: Johannes Schlüter <johannes@php.net>
Date: Wed, 17 Oct 2012 16:27:03 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36e60436dbdd655fa1e9d870436b44abfebb1e9b;p=php

Merge branch 'PHP-5.4'
---

36e60436dbdd655fa1e9d870436b44abfebb1e9b