From: Stanislav Malyshev <stas@php.net>
Date: Sun, 6 Apr 2014 03:13:24 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~429^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63e7b845933424cbc97daa6b8e727c07a1a7ea73;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix the test according to how new date code does it
  fix to work on different ICU versions
---

63e7b845933424cbc97daa6b8e727c07a1a7ea73