From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 11 Feb 2014 11:31:06 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=75f59e148c34a5125876dba8769adb9a132bd6b7;p=php

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

75f59e148c34a5125876dba8769adb9a132bd6b7