From: Johannes Schlüter <johannes@php.net>
Date: Wed, 20 Feb 2013 10:58:01 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b157e05f573a2ec3b3344317c6a981f933ff4c9a;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

b157e05f573a2ec3b3344317c6a981f933ff4c9a