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

1  2 
win32/build/config.w32

Simple merge