]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorChristopher Jones <sixd@php.net>
Fri, 16 Aug 2013 18:39:37 +0000 (11:39 -0700)
committerChristopher Jones <sixd@php.net>
Fri, 16 Aug 2013 18:39:37 +0000 (11:39 -0700)
* 'master' of https://git.php.net/repository/php-src:
  fix typo
  merge news for 5.5.2


Trivial merge