]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Mon, 24 Mar 2014 18:19:06 +0000 (19:19 +0100)
committerAnatol Belski <ab@php.net>
Mon, 24 Mar 2014 18:19:06 +0000 (19:19 +0100)
* PHP-5.5:
  more fixes related to bug #65715

1  2 
win32/build/config.w32
win32/build/confutils.js

Simple merge
Simple merge