]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRemi Collet <remi@php.net>
Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)
committerRemi Collet <remi@php.net>
Mon, 4 Aug 2014 09:08:41 +0000 (11:08 +0200)
* PHP-5.4:
  typo


Trivial merge