Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 19 Dec 2014 20:51:05 +0000 (21:51 +0100)
committerNikita Popov <nikic@php.net>
Fri, 19 Dec 2014 20:51:05 +0000 (21:51 +0100)
commitc94f62d0d98f4373bbf8f68c234b16d52c5f3273
tree8b978f2f20544b3fbdd6b33e689c931a742360af
parent00628afd74c9b133dad5d2b3052d17153e5e9320
parent87ccf50badc9926260b62ca466bdd515901815fd
Merge branch 'PHP-5.6'

Conflicts:
ext/opcache/Optimizer/pass2.c
ext/opcache/Optimizer/pass2.c