]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:09:40 +0000 (16:09 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:09:40 +0000 (16:09 -0800)
* PHP-5.5:
  added missing INSTALL_ROOT


Trivial merge