]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorDavid Soria Parra <dsp@php.net>
Tue, 19 Mar 2013 14:11:48 +0000 (15:11 +0100)
committerDavid Soria Parra <dsp@php.net>
Tue, 19 Mar 2013 14:11:48 +0000 (15:11 +0100)
* PHP-5.4:
  Fix typos

1  2 
main/php_ini.c

diff --cc main/php_ini.c
Simple merge