diff options
author | Stanislav Malyshev <stas@php.net> | 2014-05-11 22:44:30 -0700 |
---|---|---|
committer | Stanislav Malyshev <stas@php.net> | 2014-05-11 23:03:21 -0700 |
commit | 89798f57d4a6552b08efeee24bf54079b072c771 (patch) | |
tree | 1c2fceef5857096e214cf351e0576dc883196fe1 /ext/mbstring/php_mbregex.c | |
parent | 997be125eb0228c5b1b6dd278f617791e71192c6 (diff) | |
parent | c507c9f01b10d7d991e38af55d22fad122dfbdf8 (diff) | |
download | php-git-89798f57d4a6552b08efeee24bf54079b072c771.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
improve CURL tests to allow testing without separate server
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions