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

Merge branch 'PHP-5.4'
---

f43e4f9883047b4be6bd01bf80f070682131ad5f