From: Xinchen Hui <laruence@php.net>
Date: Thu, 7 Feb 2013 15:45:28 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~30^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee825e0b42d9fec9b1f2e999b691c6eedf46fdd1;p=php

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

ee825e0b42d9fec9b1f2e999b691c6eedf46fdd1