diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-02-26 15:10:23 +0100 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-02-26 15:10:23 +0100 |
| commit | d18089d62181b000d67b66e928cc796d8dd277e7 (patch) | |
| tree | abda828c1e1f84f465353f3b01e9ce31556ee480 /ext/mysql/php_mysql.c | |
| parent | e1b1ef0d793dabcf4ca7ab4e62fae18f0b73b013 (diff) | |
| parent | 4d9c556b5d4f0a04a42d1cc4dc0ac6cadd2e198a (diff) | |
| download | php-git-d18089d62181b000d67b66e928cc796d8dd277e7.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
add news entry
add clear_env option to FPM config
Diffstat (limited to 'ext/mysql/php_mysql.c')
0 files changed, 0 insertions, 0 deletions