diff options
| author | ULF WENDEL <uw@php.net> | 2012-09-29 12:17:13 +0200 |
|---|---|---|
| committer | ULF WENDEL <uw@php.net> | 2012-09-29 12:17:13 +0200 |
| commit | 13d4d8e2d037385bfa2c7775929b65ae1f73998d (patch) | |
| tree | 934902490f62df7e1d09928f1934adc5f433c21a /ext/mysqlnd/mysqlnd_auth.c | |
| parent | c8cc0cde34879647a1d7f957e745ff4de74e7b98 (diff) | |
| parent | 20e76f4487baf60dc52b348e86bae4628026c4c2 (diff) | |
| download | php-git-13d4d8e2d037385bfa2c7775929b65ae1f73998d.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Minor changes for MySQL 5.6
NEWS for 76601c4
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
0 files changed, 0 insertions, 0 deletions