From: Stanislav Malyshev <stas@php.net>
Date: Sun, 16 Jun 2013 22:30:44 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~438
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6db7e31fa66e4d679cb33e990c3b3ee25e0f5f76;p=php

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
---

6db7e31fa66e4d679cb33e990c3b3ee25e0f5f76