From: Anatol Belski <ab@php.net>
Date: Thu, 28 Aug 2014 15:39:03 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_REMOVALS~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7faac0267fe2fe048e16f2be8eb46c7c56f5dc8c;p=php

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

# By Popa Adrian Marius
# Via Popa Adrian Marius
* 'master' of git.php.net:php-src:
  rename misleading define
---

7faac0267fe2fe048e16f2be8eb46c7c56f5dc8c