diff options
| author | Nikita Popov <nikic@php.net> | 2012-06-29 13:15:35 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-06-29 13:15:35 +0200 |
| commit | d86b6ea35c5e0afefb373979cb743098178a0a07 (patch) | |
| tree | 390f293b3d545fb3ef886905f1e0dc389a0a6aef /ext/mysqlnd/mysqlnd.c | |
| parent | 8992da245136a2ef697fb2911cbf138910150d08 (diff) | |
| parent | e6cf7d774519300c08399cae5bfba90e33749727 (diff) | |
| download | php-git-d86b6ea35c5e0afefb373979cb743098178a0a07.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fix some lengths in crypt()
Conflicts:
ext/standard/crypt.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
0 files changed, 0 insertions, 0 deletions