From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 28 Apr 2015 14:57:35 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.9RC1~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43c69443bbea3b0ddace77482b09db26864748bb;p=php

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

43c69443bbea3b0ddace77482b09db26864748bb