]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Fri, 11 Jul 2014 13:06:56 +0000 (15:06 +0200)
committerAnatol Belski <ab@php.net>
Fri, 11 Jul 2014 13:06:56 +0000 (15:06 +0200)
* PHP-5.4:
  fix makefile in phpize mode


Trivial merge