From: Johannes Schlüter <johannes@php.net>
Date: Wed, 12 Sep 2012 21:35:40 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cebd084182e66fc42cd04c5d196575f3a3be721a;p=php

Merge branch 'PHP-5.4'
---

cebd084182e66fc42cd04c5d196575f3a3be721a