From: Xinchen Hui <laruence@php.net>
Date: Sun, 31 Mar 2013 13:27:22 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~227^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=971676e859c8d36859cd1b4d7b87d5e32ff9c72a;p=php

Merge branch 'PHP-5.5'
---

971676e859c8d36859cd1b4d7b87d5e32ff9c72a