From: Stanislav Malyshev <stas@php.net>
Date: Tue, 24 Jun 2014 18:23:48 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0RC2~1^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4c046d156d1fd7279fb817c293a9c1e9f15cbfc;p=php

Merge branch 'PHP-5.5' into PHP-5.6

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

b4c046d156d1fd7279fb817c293a9c1e9f15cbfc