From: Xinchen Hui <laruence@php.net>
Date: Sun, 1 Jun 2014 11:42:20 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta4~1^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4e7c7d50e14749a9ab49caf8ca7b78d2f9d13a5;p=php

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

c4e7c7d50e14749a9ab49caf8ca7b78d2f9d13a5