]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c9819f 111aa9f)
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)
* PHP-5.4:
  Fixed bug #63468 (wrong called method as callback with inheritance)

Conflicts:
NEWS


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.