]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Fri, 27 Sep 2013 09:44:31 +0000 (13:44 +0400)
committerDmitry Stogov <dmitry@zend.com>
Fri, 27 Sep 2013 09:44:31 +0000 (13:44 +0400)
* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.h
sapi/cgi/cgi_main.c

Simple merge
Simple merge