]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 10:22:27 +0000 (12:22 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 10:22:27 +0000 (12:22 +0200)
commit0618e33b5dbac73efc0893884051b5c24e7ab409
tree611c52f3dcacb826517bb724231ecf27095a630e
parentd6394e66a31e788560e664d6823d30b2e759d7cb
parentda6465a268d9ece2ffd38447890b206dd94b3250
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4

* 'PHP-5.4' of git.php.net:/php-src:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)