From: Johannes Schlüter <johannes@php.net>
Date: Thu, 24 Jul 2014 16:00:06 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=432bd117a97c283490ecb2f4206535223e02d88e;p=php

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

432bd117a97c283490ecb2f4206535223e02d88e