From: Stanislav Malyshev <stas@php.net>
Date: Mon, 14 Jan 2013 01:27:05 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30fd25bb498f8cb1f4cc45e576f04535d8dd0d2d;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway
---

30fd25bb498f8cb1f4cc45e576f04535d8dd0d2d