]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:13:58 +0000 (16:13 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 24 Nov 2014 00:13:58 +0000 (16:13 -0800)
commit7e4de4f8d65812acc10d7ec1590c42a76d77b384
tree9447ed64be481539f6079f34897c16ac3f0401a9
parentfa7615af59eff77ccf383962893fee403cee45c0
parent6d148f7ed97ec55439c378577c4373e03842414e
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Update comments in php.ini
php.ini-development
php.ini-production