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

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

68c9f5d84ce571c464bddd8154dc020d3c62fa72