]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 2 Jul 2014 09:12:32 +0000 (11:12 +0200)
committerAnatol Belski <ab@php.net>
Wed, 2 Jul 2014 09:12:32 +0000 (11:12 +0200)
commitb69f369d3d76e9e1159aa26582689c5ff1451bfd
tree2acf976c47e1920512abc269a75a7919b0df5eb1
parent122ee0a1cf2b31ae2497fada3900848382fbfb70
parent49e175be422191c114f3d9a18f0e3b9c5927452e
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  backported the VC12 fix for ARG_MAX