]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 22:08:42 +0000 (00:08 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 18 Apr 2012 22:08:42 +0000 (00:08 +0200)
* PHP-5.4:
  Fix slight grammar glitch (thanks Dan Brown)

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

Simple merge
Simple merge