]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 20 Nov 2012 08:58:16 +0000 (12:58 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 20 Nov 2012 08:58:16 +0000 (12:58 +0400)
commit8f65c76d2e0e4b13c8419627b65c3c9688c4bbbd
treee6f038b891f7e0563f7875da691b227942c9aac5
parent3c9819ffd550005df29181c2fa44477cdcca5c52
parent111aa9fd2ecbfcc1d8048dca96932b3b954614bf
Merge branch 'PHP-5.4' into PHP-5.5

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

Conflicts:
NEWS