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

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

9aa7343ae0828d881e8438a5a9146fd4a95a93d9