diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-06-24 11:23:48 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-06-24 11:23:48 -0700 |
| commit | b4c046d156d1fd7279fb817c293a9c1e9f15cbfc (patch) | |
| tree | feef971984f4ac3d90220d8a232f99d244ded3bd /sapi/phpdbg/phpdbg_parser.c | |
| parent | 03b3013ca97ef87a32267a35d0aacf05fee730bd (diff) | |
| parent | 2ee09835c1f9cd2fa075cc1eeca31972f07cfd26 (diff) | |
| download | php-git-b4c046d156d1fd7279fb817c293a9c1e9f15cbfc.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix test - because of big #67397 we don't allow overlong locales anymore
Diffstat (limited to 'sapi/phpdbg/phpdbg_parser.c')
0 files changed, 0 insertions, 0 deletions