From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 19 Dec 2013 19:01:00 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~109^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d4f4b66d434788b389ddf96950bb5d7974e603bd;p=php

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

d4f4b66d434788b389ddf96950bb5d7974e603bd