From: Stanislav Malyshev <stas@php.net>
Date: Mon, 9 Mar 2015 06:41:30 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f333fa93c63f70d06b5aa8c65b6bf23057b1b58;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  added missing parentheses
  Fix #67626
  Fix #63486

Conflicts:
	main/streams/userspace.c
---

0f333fa93c63f70d06b5aa8c65b6bf23057b1b58