From: Anatol Belski <ab@php.net>
Date: Mon, 24 Feb 2014 09:13:11 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha3~1^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60ed3f78bdab82b21c67b12ecd31ff7fd710e4f2;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fixed macro
---

60ed3f78bdab82b21c67b12ecd31ff7fd710e4f2