]> granicus.if.org Git - php/commit
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)
commiteb7c33b2045f65fc067055f067c9011c55337a4f
tree146e0b2abb9d7d24d0595c060a22ce4f1452a9eb
parentb5d1530e4fb8c1e0f32bda1a9602a306a9f7585b
parent33a9f01d3694be2b14e47d6d06100e67cfa4ba58
Merge branch 'PHP-5.4' into PHP-5.5

* 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