]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 22:30:44 +0000 (15:30 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 16 Jun 2013 22:30:44 +0000 (15:30 -0700)
* PHP-5.5:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix


Trivial merge