]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Tue, 31 Mar 2015 06:17:13 +0000 (09:17 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Tue, 31 Mar 2015 06:17:13 +0000 (09:17 +0300)
* 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


Trivial merge