]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Thu, 23 Jul 2015 05:43:33 +0000 (07:43 +0200)
committerAnatol Belski <ab@php.net>
Thu, 23 Jul 2015 05:43:33 +0000 (07:43 +0200)
commite60bcaeb01d189ecea5bf7dfd416f3bf7e22c4ed
treed99ff78b19f009309319d5428ea52472ba0ba1d3
parentadd2b158e2126eb4e0ff85414bb1c7cbe6a56ca8
parent91f985b2f9b5ba03d7b98bdaa710331c115f6a70
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix config.w32
  fix C99 compat
  Align CVE format for #69669
  Fix 69882 entry