From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 18:23:02 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.15RC1~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2ee09835c1f9cd2fa075cc1eeca31972f07cfd26;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix test - because of big #67397 we don't allow overlong locales anymore
---

2ee09835c1f9cd2fa075cc1eeca31972f07cfd26