summaryrefslogtreecommitdiff
path: root/Zend/zend_extensions.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2012-11-20 12:54:40 +0400
committerDmitry Stogov <dmitry@zend.com>2012-11-20 12:54:40 +0400
commit111aa9fd2ecbfcc1d8048dca96932b3b954614bf (patch)
treec1b96475b82a2aaf8d8f7e4058c84959464aef0f /Zend/zend_extensions.c
parent75746d60b6e6a45512842e222429c127be58b733 (diff)
parent396c1e990a0e513cf2e8510e9b6f82ab425c9e3a (diff)
downloadphp-git-111aa9fd2ecbfcc1d8048dca96932b3b954614bf.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: Fixed bug #63468 (wrong called method as callback with inheritance) Conflicts: NEWS
Diffstat (limited to 'Zend/zend_extensions.c')
0 files changed, 0 insertions, 0 deletions