From: Xinchen Hui <laruence@php.net>
Date: Sun, 17 Nov 2013 09:11:20 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~188
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a282136a3b5c44f1afa6af86f967ac6918e7013;p=php

Merge branch 'PHP-5.5'
---

5a282136a3b5c44f1afa6af86f967ac6918e7013