From: Johannes Schlüter <johannes@php.net>
Date: Wed, 10 Jul 2013 17:47:15 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~42^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1891577d04f46880f9da3e89d32279276cb08909;p=php

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

1891577d04f46880f9da3e89d32279276cb08909