From: Xinchen Hui <laruence@php.net>
Date: Wed, 24 Jun 2015 13:44:31 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.0.0beta1~12^2~49^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2a9e012aa5dc559ab66de422c1b2dcd8bc62bf73;p=php

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

2a9e012aa5dc559ab66de422c1b2dcd8bc62bf73