From: Stanislav Malyshev <stas@php.net>
Date: Mon, 21 Oct 2013 06:04:41 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~227^2~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae31a68774b9f530e7a4e2c0fed20eab16edb8e4;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  5.4.21 release date
  fix argument type & remove warning
  fix const warnings in intl methods
  Fix coverity issue with -1 returned by findOffset not being handled by getPreferredTag
  fix possibility of access to *storedType without initialization
  5.4.21 release date
---

ae31a68774b9f530e7a4e2c0fed20eab16edb8e4