From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 7 Aug 2014 09:22:14 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~19^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=33e9bb79a30823ebf398d1e2fc366ce34a1e1693;p=php

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

33e9bb79a30823ebf398d1e2fc366ce34a1e1693