From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 6 Jan 2013 15:10:16 +0000 (+0000)
Subject: Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98331c89a178add153f9f30484f59300499fc742;p=php

Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
---

98331c89a178add153f9f30484f59300499fc742