Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Mon, 20 Jan 2014 13:25:26 +0000 (21:25 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 20 Jan 2014 13:25:26 +0000 (21:25 +0800)
1  2 
ext/opcache/ZendAccelerator.h

Simple merge