From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Oct 2013 06:04:26 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00697927d8d99bec2c7135fe62d5807544fe12f8;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
---

00697927d8d99bec2c7135fe62d5807544fe12f8