]> granicus.if.org Git - php/commit
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)
commit59dcf9879b18aa5ac9ca01db6af9a0cef2f59c82
tree5bf0f34882d458afc43062ef2718bfcc720d1149
parentcaba0203e8fbc9c5ea103d52c1399cb9a06ee654
parent223f7d9a44332fc08574a18af0266da45c42f340
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  more fixes related to bug #65715
win32/build/config.w32
win32/build/confutils.js