From: Anatol Belski <ab@php.net>
Date: Mon, 24 Feb 2014 09:12:50 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.11RC1~61
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bca0e5edd5b80990b36e611da59ee32b6a0a0161;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed macro
---

bca0e5edd5b80990b36e611da59ee32b6a0a0161