From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Sat, 2 Feb 2013 17:40:05 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)
X-Git-Tag: php-5.5.0alpha5~43^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6ba5d0a4a5b714c048e0ded9933bfef2031f17c2;p=php

Merge branch 'PHP-5.4' into PHP-5.5 (strategy ours)

* PHP-5.4:
  Move macro back to .c file
---

6ba5d0a4a5b714c048e0ded9933bfef2031f17c2