]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Sun, 17 Mar 2013 06:59:23 +0000 (10:59 +0400)
committerDmitry Stogov <dmitry@zend.com>
Sun, 17 Mar 2013 06:59:23 +0000 (10:59 +0400)
* PHP-5.5:
  Enabled O+ build by default (it may be disabled before 5.0.0 release)


Trivial merge