From: Xinchen Hui <laruence@php.net>
Date: Mon, 13 Jul 2015 08:40:56 +0000 (+0800)
Subject: Merge branch 'master' of https://github.com/Geolim4/php-src
X-Git-Tag: php-7.1.1RC1~35^2~12^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c2658ed529d9cfed57e4ff61531f0966638d098;p=php

Merge branch 'master' of https://github.com/Geolim4/php-src
---

8c2658ed529d9cfed57e4ff61531f0966638d098