From: Xinchen Hui <laruence@php.net>
Date: Mon, 26 May 2014 09:32:53 +0000 (+0800)
Subject: Merge branch 'master' into phpng
X-Git-Tag: POST_PHPNG_MERGE~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0df38cdcb671cacaafb5e5d13cc0770013c75eb9;p=php

Merge branch 'master' into phpng
---

0df38cdcb671cacaafb5e5d13cc0770013c75eb9