From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 3 Mar 2013 18:10:41 +0000 (-0500)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~500^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ef99886bcb90158960e044b7be2d6f5b9614231d;p=php

Merge branch 'PHP-5.5'
---

ef99886bcb90158960e044b7be2d6f5b9614231d