From: Xinchen Hui <laruence@gmail.com>
Date: Thu, 17 Mar 2016 03:57:08 +0000 (+0800)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.1.0alpha1~474
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3940c1867d10f177c46860ed4632d79960f5e82;p=php

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

* 'master' of git.php.net:/php-src:
  Fix build
  Fix build
  Fix build
  prepare for 5.6.20RC1
  Fix more emails
  More email fixing
  Fix emails in headers. @mysql.com addresses are no more since many years.
  fix #ifdef usage
---

a3940c1867d10f177c46860ed4632d79960f5e82