diff options
author | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:37:19 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 15:37:55 -0700 |
commit | c5275b4a92fb9689d8d26112a9c3f91def201d35 (patch) | |
tree | e4cb168fe69730b164e9fa6f701045faf9e9c739 /ext/mysqlnd/php_mysqlnd.c | |
parent | fe72caa6e5ae18be1ebdbb97a3b910fce5b2dc6f (diff) | |
parent | 442264ffd6c12eb5278f64ef6554d7fd0780d3fe (diff) | |
download | php-git-c5275b4a92fb9689d8d26112a9c3f91def201d35.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix apr_psprintf format string from e0df4e3dba7c4ab92442b9e82c1de01fdbaa3cce
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions