summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/php_mysqlnd.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2012-09-21 14:18:37 +0400
committerDmitry Stogov <dmitry@zend.com>2012-09-21 14:18:37 +0400
commited3a2eec9c81687b09d9698887df67b498ca6ecf (patch)
treede98c586a4289b26837dce46ac8b4bcede8bb701 /ext/mysqlnd/php_mysqlnd.c
parentf037ddc85971496f985d0cea540129b9d928bb97 (diff)
parent4db74b7f1981bf19805e815f983c50d93df2c26a (diff)
downloadphp-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