]> granicus.if.org Git - php/commit
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)
commit2ee09835c1f9cd2fa075cc1eeca31972f07cfd26
tree2f8d429f67504659aedae34ffe8747fca3f99df6
parente2ed4874b54b7d3673d68a6790a91bb85e3eb2e6
parent9d1d25e625ce7efebd633c460690d2949e58fb4c
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