Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2013 06:04:26 +0000 (23:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 21 Oct 2013 06:04:26 +0000 (23:04 -0700)
* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date


Trivial merge