From: Xinchen Hui <laruence@php.net>
Date: Wed, 18 Apr 2012 10:15:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~295
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b9e88d9e6ed528d138dca815c8b5aff5b7f89c7;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  Fixed bug #61761 ('Overriding' a private static method with a different signature causes crash)
---

6b9e88d9e6ed528d138dca815c8b5aff5b7f89c7