]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Thu, 19 Mar 2015 00:36:28 +0000 (02:36 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Thu, 19 Mar 2015 00:36:28 +0000 (02:36 +0200)
* PHP-5.5:
  Align entries format
  Add CVE to bug #69248
  Add CVE assigned to 5.5.22 bugs after the release


Trivial merge