diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:55:24 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:55:45 -0700 |
commit | d3c4292db7b905b7ff4f2d95ab2ecf0337a78ccc (patch) | |
tree | 1e741967285e5d87c4199b75a3cf768b5dc1c98f /ext/mysqlnd/php_mysqlnd.c | |
parent | 1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee (diff) | |
parent | 733b09442d40ae2803ca1ffd073a74ca4a8ebb07 (diff) | |
download | php-git-d3c4292db7b905b7ff4f2d95ab2ecf0337a78ccc.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66721
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions