From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 25 Nov 2013 10:11:45 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~185
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3c2c2bcb136945d814be20b12fda27992a01769;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed compatibility with old PHP versions
  Fixed bug #65915 (Inconsistent results with require return value)

Conflicts:
	NEWS
---

b3c2c2bcb136945d814be20b12fda27992a01769