diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:38:20 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:39:32 -0700 |
commit | 1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee (patch) | |
tree | d725141bbc3ad5287ebc52491154129fcd28d993 /ext/mysqlnd/php_mysqlnd.c | |
parent | 3aab84c1008cddca9f4429c9079a94a52966eb07 (diff) | |
parent | c5275b4a92fb9689d8d26112a9c3f91def201d35 (diff) | |
download | php-git-1be29a404aaba3a473d9cb7fa4b4c4cf63f6acee.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions