]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebc80d6 184db66)
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Mon, 28 Jan 2013 02:07:42 +0000 (18:07 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 28 Jan 2013 02:07:42 +0000 (18:07 -0800)
* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
UPGRADING


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