From: Xinchen Hui <laruence@gmail.com>
Date: Wed, 4 Apr 2012 08:37:29 +0000 (+0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.4RC1~155
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9882358984709539a3aa5228ef95843da52c7d7b;p=php

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Fix warning "suggest parentheses around assignment"

Conflicts:
	main/SAPI.c
---

9882358984709539a3aa5228ef95843da52c7d7b