diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:32:09 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:32:42 -0700 |
| commit | c1d5937f7fba1230f14af47877615c8973abf7ff (patch) | |
| tree | 2be98fc16c5fd422668d7793264be5a2406e40c8 /ext/mysqlnd/php_mysqlnd.c | |
| parent | 04a11b850a17103d5a508932c768d423fbf6d870 (diff) | |
| parent | 5811610d713471a100a1a7f8ab8e00a1c4b12522 (diff) | |
| download | php-git-c1d5937f7fba1230f14af47877615c8973abf7ff.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #66482, replace wrong item name 'priority' with 'process.priority' in php-fpm.conf
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions