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

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

8d1ec3814e1b3f00a7afe2f32e2989121b3ae647