]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  fixed macro


Trivial merge