From: Bob Weinand <bobwei9@hotmail.com>
Date: Sat, 21 Dec 2013 23:55:46 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~103^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=129fb22b37e6689cef38f436c277d49f4f24a8bb;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_vm_opcodes.c
---

129fb22b37e6689cef38f436c277d49f4f24a8bb
diff --cc Zend/zend_vm_opcodes.c
index aa292d3a03,c565510fac..04af26cdb4
--- a/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -18,7 -18,9 +18,9 @@@
     +----------------------------------------------------------------------+
  */
  
+ #include <stdio.h>
+ 
 -const char *zend_vm_opcodes_map[164] = {
 +const char *zend_vm_opcodes_map[165] = {
  	"ZEND_NOP",
  	"ZEND_ADD",
  	"ZEND_SUB",