From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 31 Mar 2015 15:35:10 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d3868984cc0c43dd66f5aa0d2e56a92821300a6;p=php

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

2d3868984cc0c43dd66f5aa0d2e56a92821300a6