From: Xinchen Hui <laruence@php.net>
Date: Wed, 25 Dec 2013 07:36:45 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~353^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd0a8f31a48d80042382fcf7e6fb8419d8da6afc;p=php

Merge branch 'master' of git.php.net:php-src
---

bd0a8f31a48d80042382fcf7e6fb8419d8da6afc