]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)
committerAnatol Belski <ab@php.net>
Thu, 10 Jul 2014 20:35:41 +0000 (22:35 +0200)
* PHP-5.6:
  fix end of stream exception when generating makefile


Trivial merge