From: Stanislav Malyshev <stas@php.net>
Date: Sun, 4 Aug 2013 23:06:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~346^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c793a6569013f9ab46f2cd7331cc1a04aa42cbed;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  non living code related typo fixes

Conflicts:
	Zend/zend_compile.c
---

c793a6569013f9ab46f2cd7331cc1a04aa42cbed
diff --cc Zend/zend_compile.c
index 196688e46e,326d4ef976..f250b2be20
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@@ -1734,7 -1723,7 +1734,7 @@@ void zend_do_begin_function_declaration
  	}
  
  	{
- 		/* Push a seperator to the switch stack */
 -		/* Push a separator to the switch and foreach stacks */
++		/* Push a separator to the switch stack */
  		zend_switch_entry switch_entry;
  
  		switch_entry.cond.op_type = IS_UNUSED;