From: Rui Hirokawa <hirokawa@php.net>
Date: Tue, 30 Jul 2013 23:18:51 +0000 (+0900)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.2RC1~1^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f14ed5bce0e2c0fc1a9d819d1e704cb7492d31fb;p=php

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

f14ed5bce0e2c0fc1a9d819d1e704cb7492d31fb