diff options
| author | Anatol Belski <ab@php.net> | 2014-09-26 17:49:47 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-26 17:49:47 +0200 |
| commit | d1c4fd934a56f2de932e50a08bf434587600bf33 (patch) | |
| tree | df6819ef6e2a9e645381e6b3a54346e420dab4b7 /ext/mysqlnd/mysqlnd_debug.c | |
| parent | c032299d4faf3d68058312078a5afa5d39040f12 (diff) | |
| parent | 06a9a74d177b84617ddc4ea6210529311072da59 (diff) | |
| download | php-git-d1c4fd934a56f2de932e50a08bf434587600bf33.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
- Updated to version 2014.8 (2014h)
fix date
update NEWS
Revert xp_ssl.c to the state of 5.4.32 due to regressions
Diffstat (limited to 'ext/mysqlnd/mysqlnd_debug.c')
0 files changed, 0 insertions, 0 deletions