]> granicus.if.org Git - php/commit
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)
commit90329a32dcc7e5f875bc58cb68a20ae16f506d1b
tree8f25b08287aac4a4a13772d49e02d1bc918685fe
parentb7389f0f0780dd189d73ffb3fd7d8843793f5530
parent1bc77559f394ae762607ee3775128331f14e5859
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