diff options
author | Jerome Loyet <fat@php.net> | 2012-09-28 01:19:01 +0200 |
---|---|---|
committer | Jerome Loyet <fat@php.net> | 2012-09-28 01:19:01 +0200 |
commit | be043ab6d00e9747727aefcb0dde12a40ddb4e8d (patch) | |
tree | 346663e94b21ff7039a82084e5431f3f352085b5 /ext/mysqlnd/mysqlnd_auth.c | |
parent | b2f4e686f0947217ee70953ecbafa84f173770c2 (diff) | |
parent | 72f3457161aaf8c6bd0980aff855beca20d63404 (diff) | |
download | php-git-be043ab6d00e9747727aefcb0dde12a40ddb4e8d.tar.gz |
Merge branch 'fuckgit' into PHP-5.4
* fuckgit:
- Fixed bug #62947 (Unneccesary warnings on FPM)
- Fixed bug #63085 (Systemd integration and daemonize)
Conflicts:
sapi/fpm/config.m4
Diffstat (limited to 'ext/mysqlnd/mysqlnd_auth.c')
0 files changed, 0 insertions, 0 deletions