Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_vm_opcodes.c
Merge branch 'PHP-5.6'
Merge branch 'master' of sapi/phpdbg into PHP-5.6
Merge branch 'PHP-5.6'
- Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
Merge branch 'PHP-5.6'

* PHP-5.6:
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
- BFN
stop warnings from unused opcode map
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  stop warnings from unused opcode map
  - BFN
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  stop warnings from unused opcode map
  - BFN
  - Fixed bug #66311 (Stack smashing protection kills PDO/ODBC queries) patch by: michael at orlitzky dot com
  Included new .c file in build too
  Fixed little typo in zend_vm_gen.php
  Moved to new file, killing a lot of warnings
Merge branch 'PHP-5.6'

* PHP-5.6:
  stop warnings from unused opcode map
  - BFN

Conflicts:
	NEWS
	Zend/zend_vm_opcodes.h
Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6
missing, apparently
opcodes
opcodes
fix news file
fix news
fix news