]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f037ddc 4db74b7)
Merge branch 'PHP-5.3' into PHP-5.4
authorDmitry Stogov <dmitry@zend.com>
Fri, 21 Sep 2012 10:18:37 +0000 (14:18 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 21 Sep 2012 10:18:37 +0000 (14:18 +0400)
commited3a2eec9c81687b09d9698887df67b498ca6ecf
treede98c586a4289b26837dce46ac8b4bcede8bb701tree | snapshot
parentf037ddc85971496f985d0cea540129b9d928bb97commit | diff
parent4db74b7f1981bf19805e815f983c50d93df2c26acommit | diff
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fixed bug #63111 (is_callable() lies for abstract static method)

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.