]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorTjerk Meesters <datibbaw@php.net>
Tue, 23 Sep 2014 10:12:12 +0000 (18:12 +0800)
committerTjerk Meesters <datibbaw@php.net>
Tue, 23 Sep 2014 10:12:12 +0000 (18:12 +0800)
* PHP-5.6:
  Fixed typo

1  2 
php.ini-development
php.ini-production

Simple merge
Simple merge