Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Mon, 24 Feb 2014 09:12:50 +0000 (10:12 +0100)
committerAnatol Belski <ab@php.net>
Mon, 24 Feb 2014 09:12:50 +0000 (10:12 +0100)
commitbca0e5edd5b80990b36e611da59ee32b6a0a0161
treedeb3c73404680ab2ac2afbc7a949d1b68117bc9d
parent2198bbce868e8a3423e05c573ab4f69417ef5b88
parentc6a4a7cad6ee80176047cbd874788235838f5c8b
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed macro