]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Jun 2015 19:29:35 +0000 (22:29 +0300)
committerLior Kaplan <kaplanlior@gmail.com>
Mon, 8 Jun 2015 19:29:35 +0000 (22:29 +0300)
* PHP-5.4:
  NEWS entry for: Upgrade bundled sqlite to 3.8.10.2
  Upgrade bundled sqlite to 3.8.10.2
  Add CVE used in PHP 5.4.39, 5.4.40, 5.4.41
  Add CVE to #68598


Trivial merge