]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Sun, 6 Apr 2014 03:13:48 +0000 (20:13 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 6 Apr 2014 03:13:48 +0000 (20:13 -0700)
* PHP-5.6:
  fix the test according to how new date code does it
  fix to work on different ICU versions


Trivial merge