diff options
author | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-20 01:01:23 +0300 |
---|---|---|
committer | Lior Kaplan <kaplanlior@gmail.com> | 2014-08-20 01:01:23 +0300 |
commit | aa6dc6c10801daef66564f5100fc391a432ba5b9 (patch) | |
tree | 80156e551ecaa966410095321693a9913e56259d /sapi/apache2handler/php_functions.c | |
parent | ac4569621dc8762862dca6d39adf4ceb39e7e00b (diff) | |
parent | 276bead9c47e91fa3fffce87a6911eaafdb1f8ab (diff) | |
download | php-git-aa6dc6c10801daef66564f5100fc391a432ba5b9.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Add NEWS entry for bug #67730
Add CVE ID for bug #67539
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions