]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 13:48:11 +0000 (17:48 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 26 Nov 2013 13:48:11 +0000 (17:48 +0400)
commit0999d8504987ada17c36107c90f42a0f481cb774
treebdbb8adf72fb0a1737e8e75b65e7000e54c50292
parent8fdc973afa95ba1a19df09d8d300f7c5b7cdcbb8
parentd85ac7fb3f498455cfc1b051f8d48c9ba8ed8fdd
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)

Conflicts:
NEWS
NEWS
ext/opcache/Optimizer/block_pass.c
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/zend_optimizer.c