diff options
author | Stanislav Malyshev <stas@php.net> | 2015-06-09 10:49:31 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2015-06-09 10:49:31 -0700 |
commit | c3b2360e466789e29d451fb60e1e700c145c1d76 (patch) | |
tree | 61a327389e41308a7ad7c8ec32bacb0bcc4572ba /ext/java/java.c | |
parent | 87d9ba88e65417a7765530349bad003a5ad76308 (diff) | |
parent | 33a9f01d3694be2b14e47d6d06100e67cfa4ba58 (diff) | |
download | php-git-c3b2360e466789e29d451fb60e1e700c145c1d76.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.4.42
* 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
Diffstat (limited to 'ext/java/java.c')
0 files changed, 0 insertions, 0 deletions