]> granicus.if.org Git - php/commitdiff
Merge branch 'php.ini_text_fix' of https://github.com/BryanH/php-src
authorXinchen Hui <laruence@php.net>
Sun, 25 Nov 2012 03:24:32 +0000 (11:24 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 25 Nov 2012 03:24:32 +0000 (11:24 +0800)

Trivial merge