From: Lior Kaplan <kaplanlior@gmail.com>
Date: Tue, 31 Mar 2015 06:17:13 +0000 (+0300)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=90329a32dcc7e5f875bc58cb68a20ae16f506d1b;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Align entries format
  Update CVE for Bug #68976 to CVE-2015-2787 instead of reusing CVE for #68710
  Add CVE for bug #69207
---

90329a32dcc7e5f875bc58cb68a20ae16f506d1b