projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 75746d6 396c1e9)
Merge branch 'PHP-5.3' into PHP-5.4
authorDmitry Stogov <dmitry@zend.com>
Tue, 20 Nov 2012 08:54:40 +0000 (12:54 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 20 Nov 2012 08:54:40 +0000 (12:54 +0400)
commit111aa9fd2ecbfcc1d8048dca96932b3b954614bf
treec1b96475b82a2aaf8d8f7e4058c84959464aef0ftree | snapshot
parent75746d60b6e6a45512842e222429c127be58b733commit | diff
parent396c1e990a0e513cf2e8510e9b6f82ab425c9e3acommit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS
NEWS diff1 | diff2 | blob | history
Zend/zend_API.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.