]> granicus.if.org Git - php/commit
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)
commit3eba8cf6739f987c111ea2276ada8d7caca1eb9b
treec2d7c55261a0423e49c7ea56e5f3dc5958346739
parent9ef4e5d23d331227cbc3dfed04f9702b8012e1ef
parentf90483001236c863abe1070d05ee2214db5a0a97
Merge branch 'PHP-5.5'

* PHP-5.5:
  Added support for GNU Hurd. (Svante Signell)

Conflicts:
NEWS
ext/opcache/ZendAccelerator.h
sapi/cgi/cgi_main.c