From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 2 Jan 2014 12:47:44 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=110b7dcfb887c352f9ab73762ed5c8b68055c28f;p=php

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

110b7dcfb887c352f9ab73762ed5c8b68055c28f