]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Tue, 5 Feb 2013 11:29:01 +0000 (12:29 +0100)
committerRemi Collet <remi@php.net>
Tue, 5 Feb 2013 11:29:01 +0000 (12:29 +0100)
* PHP-5.4:
  revert

1  2 
Zend/zend_operators.h

Simple merge