From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 20 Nov 2015 07:37:43 +0000 (+0800)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~705^2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1065feba7df4df2d4f615819feea9951bb4caae5;p=php

Merge branch 'PHP-7.0'

Conflicts:
	ext/gd/gd_compat.c
---

1065feba7df4df2d4f615819feea9951bb4caae5