diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:02:38 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-09-26 01:02:38 -0700 |
| commit | c09b1b9b88113e45d34e503c6e76bb528a45ab10 (patch) | |
| tree | 45b443d849af6d560c7c5881c2839f453c4877f4 /sapi/apache2handler/php_functions.c | |
| parent | ed59fa3a0d6ef2ad1a1c99b4b23e9fb82ef02453 (diff) | |
| parent | b465f00d42dbe170e9eb905fe1dcbdbf4ce1f945 (diff) | |
| download | php-git-c09b1b9b88113e45d34e503c6e76bb528a45ab10.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Diffstat (limited to 'sapi/apache2handler/php_functions.c')
0 files changed, 0 insertions, 0 deletions