From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 9 Feb 2014 20:57:43 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha2~1^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fa6bcd8cb0acfdcdf4dc44720c5c267e2aa2f60;p=php

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

9fa6bcd8cb0acfdcdf4dc44720c5c267e2aa2f60