]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Wed, 18 Apr 2012 10:15:29 +0000 (18:15 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 18 Apr 2012 10:15:29 +0000 (18:15 +0800)
* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)


Trivial merge