From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 13 Jan 2014 08:07:50 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d09d64c15c282f91ce5af7791d52a8e2d1833aa9;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66474 (Optimizer bug in constant string to boolean conversion)

Conflicts:
	NEWS
---

d09d64c15c282f91ce5af7791d52a8e2d1833aa9