]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorXinchen Hui <laruence@php.net>
Wed, 25 Feb 2015 12:16:15 +0000 (20:16 +0800)
committerXinchen Hui <laruence@php.net>
Wed, 25 Feb 2015 12:16:15 +0000 (20:16 +0800)
commit60f18026eb5f657a4cd9effa825be58848f56fc3
treec98b93cabeb90ccc907ed448873f9c3295fe1250
parentaadf7366e066a7c2c14e3098b1db5dc37783cff2
parentd3615b5fb1b4671af015b9ab9ee920fc069f21ee
Merge branch 'PHP-5.6'

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