From: Johannes Schlüter <johannes@php.net>
Date: Thu, 24 Jul 2014 14:58:50 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~59^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=210315d5a56d832123bd6b52dce33942f94c4a83;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

210315d5a56d832123bd6b52dce33942f94c4a83