]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 18:24:40 +0000 (11:24 -0700)
committerStanislav Malyshev <stas@php.net>
Tue, 24 Jun 2014 18:24:40 +0000 (11:24 -0700)
* PHP-5.6:
  remove bug67072_2 test for 5.6+ since we'd have cleaner solution
  Fix test - because of big #67397 we don't allow overlong locales anymore


Trivial merge