]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 18:23:02 +0000 (11:23 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 18:23:02 +0000 (11:23 -0700)
* PHP-5.4:
  Fix test - because of big #67397 we don't allow overlong locales anymore


Trivial merge