diff options
| author | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:56:59 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2013-07-14 23:56:59 -0700 |
| commit | 8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec (patch) | |
| tree | 62482a43997b9f3e34155c67d6540d6fb6432db6 /ext/mysql/php_mysql.c | |
| parent | 07ab23655a993fa8810def7ac9a5097058e1770f (diff) | |
| parent | 2bad01e61ba2677e1e8303f9b56574ebb7ba3f00 (diff) | |
| download | php-git-8c663fd4ccd8e9180ca2c0cdf46d81fa442f40ec.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #62665: add curl.cainfo to php.ini
Conflicts:
php.ini-development
php.ini-production
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions