From: Anatol Belski <ab@php.net>
Date: Thu, 23 Jul 2015 05:43:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: php-7.0.0beta3~5^2~99^2~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e60bcaeb01d189ecea5bf7dfd416f3bf7e22c4ed;p=php

Merge branch 'PHP-5.6'

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

e60bcaeb01d189ecea5bf7dfd416f3bf7e22c4ed