diff options
| author | Daniel Lowrey <rdlowrey@php.net> | 2014-08-25 18:16:38 +0200 |
|---|---|---|
| committer | Daniel Lowrey <rdlowrey@php.net> | 2014-08-25 18:16:38 +0200 |
| commit | 546a32e2b3e73f6e812c2a61fe8de6fbdc1def58 (patch) | |
| tree | 812d2a17ebb02d91c6717a855212b1940980ad51 /ext/mbstring/php_mbregex.c | |
| parent | 6e87b01e95e559a1b83417d8a08d2ef51b58c5ee (diff) | |
| parent | 640214701c9cf259c899d283ea769b3045d2553c (diff) | |
| download | php-git-546a32e2b3e73f6e812c2a61fe8de6fbdc1def58.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Bug #67850: Build when OpenSSL compiled without SSLv3 support
Conflicts:
ext/openssl/xp_ssl.c
Diffstat (limited to 'ext/mbstring/php_mbregex.c')
0 files changed, 0 insertions, 0 deletions