]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorAnatol Belski <ab@php.net>
Fri, 11 Jul 2014 07:37:19 +0000 (09:37 +0200)
committerAnatol Belski <ab@php.net>
Fri, 11 Jul 2014 07:37:19 +0000 (09:37 +0200)
* PHP-5.4:
  fixe output_as_table() when no ext was enabled

1  2 
win32/build/confutils.js

Simple merge