]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Wed, 20 Nov 2013 09:12:06 +0000 (10:12 +0100)
committerAnatol Belski <ab@php.net>
Wed, 20 Nov 2013 09:12:06 +0000 (10:12 +0100)
* PHP-5.5:
  permanently deactivate that place, not on runtime only

1  2 
Zend/zend_operators.h

Simple merge