From: Xinchen Hui <laruence@php.net>
Date: Sun, 17 Nov 2013 09:20:13 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=140a42f779b83f5c32656741f9fd26f34edc0b1b;p=php

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

140a42f779b83f5c32656741f9fd26f34edc0b1b