]> granicus.if.org Git - php/commit
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)
commitb304a56685994c5dbfe00892bd73e5e1f3c2eb90
tree078907ee5f3314c183453dc0b0dc28705dafe0a0
parentd4454ac31b6c93ed52652f7b8fb1614965fcaa71
parent78c3ca105b0e4d7429f5381a667973810b7be86e
Merge branch 'PHP-5.6'

* 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