From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 26 Oct 2014 14:54:09 +0000 (-0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.3RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25e3560546110183d539e5c111b75ae3d99b119c;p=php

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

25e3560546110183d539e5c111b75ae3d99b119c