From: Derick Rethans <github@derickrethans.nl>
Date: Tue, 11 Nov 2014 17:01:26 +0000 (-0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.4RC1~55^2~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a19d96fc58076b09ad080c4bf75c318155bf0003;p=php

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

a19d96fc58076b09ad080c4bf75c318155bf0003