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

Merge branch 'PHP-5.4'
---

a3c84291316eb09cebe5ef78e235f93ae18ba9e5