From: Johannes Schlüter <johannes@php.net>
Date: Thu, 20 Jun 2013 09:57:10 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~50^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94e7549719350362617c6933dba6379f058e68a8;p=php

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

94e7549719350362617c6933dba6379f058e68a8