From: Derick Rethans <github@derickrethans.nl>
Date: Sat, 25 Jan 2014 15:16:34 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~388^2~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f79cc6eaed24236e3f8e474d907ea3a87880026;p=php

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

0f79cc6eaed24236e3f8e474d907ea3a87880026