From: Xinchen Hui <laruence@php.net>
Date: Thu, 20 Feb 2014 03:19:52 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~50
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0d26bb138e27fff5bba971edbecb592bd967c33;p=php

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

c0d26bb138e27fff5bba971edbecb592bd967c33