From: Stanislav Malyshev <stas@php.net>
Date: Wed, 2 Jan 2013 05:20:35 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80a9a80a52d1eb0281cd2894be05c685e4d526a0;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Bug #43177: If an eval() has a parse error, the overall exit status and return code should not be affected.
  fix NEWS

Conflicts:
	main/main.c
---

80a9a80a52d1eb0281cd2894be05c685e4d526a0