diff options
author | Stanislav Malyshev <stas@php.net> | 2014-06-24 11:23:02 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-06-24 11:23:02 -0700 |
commit | 2ee09835c1f9cd2fa075cc1eeca31972f07cfd26 (patch) | |
tree | 2f8d429f67504659aedae34ffe8747fca3f99df6 /sapi/phpdbg/phpdbg_help.c | |
parent | e2ed4874b54b7d3673d68a6790a91bb85e3eb2e6 (diff) | |
parent | 9d1d25e625ce7efebd633c460690d2949e58fb4c (diff) | |
download | php-git-2ee09835c1f9cd2fa075cc1eeca31972f07cfd26.tar.gz |
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
Diffstat (limited to 'sapi/phpdbg/phpdbg_help.c')
0 files changed, 0 insertions, 0 deletions