From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Jun 2014 02:18:09 +0000 (-0700)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~223
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9fceb05fcf7218098b84cf825628e72e95097b02;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  Bug 64744 Show the type of the non-object for more descriptive errors
---

9fceb05fcf7218098b84cf825628e72e95097b02