From: Xinchen Hui <laruence@php.net>
Date: Wed, 22 Aug 2012 10:12:11 +0000 (+0800)
Subject: Merge branch 'master' into finally
X-Git-Tag: php-5.5.0alpha1~20^2~30^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d4f91da4b6e1c4e918fa330782b9cae98334b11;p=php

Merge branch 'master' into finally
---

3d4f91da4b6e1c4e918fa330782b9cae98334b11