diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:31:14 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-04-13 17:31:44 -0700 |
| commit | 5811610d713471a100a1a7f8ab8e00a1c4b12522 (patch) | |
| tree | 5826116ea5181db7097cca67a6561d5fb883422e /ext/mysqlnd/php_mysqlnd.c | |
| parent | df8e34bcc133bec10daa01dee3c2eb0fe59bb4bb (diff) | |
| parent | 636adf251c80884c151cb233bbdae1497fdadc4a (diff) | |
| download | php-git-5811610d713471a100a1a7f8ab8e00a1c4b12522.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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