From: Christoph M. Becker <cmb@php.net>
Date: Mon, 13 Jul 2015 22:30:17 +0000 (+0200)
Subject: Merge branch 'master' of http://git.php.net/repository/php-src
X-Git-Tag: php-7.1.1RC1~35^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae5d04cd6a6965ff47a468964f6db4a4b04acecf;p=php

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

# By Anatol Belski
# Via Anatol Belski
* 'master' of http://git.php.net/repository/php-src:
  remove #ifdef
  remove comment, it's not right
---

ae5d04cd6a6965ff47a468964f6db4a4b04acecf