]> granicus.if.org Git - php/commit
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)
commit6db7e31fa66e4d679cb33e990c3b3ee25e0f5f76
treeca1229489a33f08d57f2c35382d05cf0f8418feb
parentfd706595d461a2bdd73e38cad30d80466b7b124c
parentac343d5c1f8de884921d8acddb2cc81227674615
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix bug #64936 - clean doc comment state at the beginning and end of the scan
  ws fix