From: Stanislav Malyshev <stas@php.net>
Date: Mon, 28 Jan 2013 02:07:42 +0000 (-0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~582^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=59cc4d76790502dfecbe25663d8856e0f5702540;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
	UPGRADING
---

59cc4d76790502dfecbe25663d8856e0f5702540