diff options
author | Dmitry Stogov <dmitry@zend.com> | 2012-09-21 14:18:37 +0400 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2012-09-21 14:18:37 +0400 |
commit | ed3a2eec9c81687b09d9698887df67b498ca6ecf (patch) | |
tree | de98c586a4289b26837dce46ac8b4bcede8bb701 /ext/mysqlnd/php_mysqlnd.c | |
parent | f037ddc85971496f985d0cea540129b9d928bb97 (diff) | |
parent | 4db74b7f1981bf19805e815f983c50d93df2c26a (diff) | |
download | php-git-ed3a2eec9c81687b09d9698887df67b498ca6ecf.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed bug #63111 (is_callable() lies for abstract static method)
Conflicts:
NEWS
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions