]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:56:47 +0000 (01:56 +0200)
committerFerenc Kovacs <tyrael@php.net>
Sat, 12 Apr 2014 23:56:47 +0000 (01:56 +0200)
* PHP-5.4:
  fix typo


Trivial merge