]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bf19838 ed3a2ee)
Merge branch 'PHP-5.4'
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Sep 2012 11:14:29 +0000 (15:14 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Sep 2012 11:14:29 +0000 (15:14 +0400)
* PHP-5.4:
  Fixed bug #63111 (is_callable() lies for abstract static method)
  Fix folding

Conflicts:
NEWS


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