diff options
| author | Yaroslav Halchenko <debian@onerussian.com> | 2013-12-22 22:28:57 -0500 |
|---|---|---|
| committer | Yaroslav Halchenko <debian@onerussian.com> | 2013-12-22 22:28:57 -0500 |
| commit | 7af58b9984287b740b49a851bd054589371023c4 (patch) | |
| tree | 5efa06e3e46af6d0e322c75af4e5c458ead2fd7e /THANKS | |
| parent | 0256a1cb082475fc8130c3dc9ff91d1be90bdbfa (diff) | |
| parent | a9b7d33c51ab3eb23f28a774ab088c9d35f74a03 (diff) | |
| download | fail2ban-7af58b9984287b740b49a851bd054589371023c4.tar.gz | |
Merge branch 'apache-noscripts' of https://github.com/grooverdan/fail2ban
* 'apache-noscripts' of https://github.com/grooverdan/fail2ban:
ENH: apache-noscript now matched php-cgi scripts. Closes gh-503
Conflicts:
ChangeLog -- two new entries collided, Reformatted the merged one a bit
Diffstat (limited to 'THANKS')
| -rw-r--r-- | THANKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -26,6 +26,7 @@ Christoph Haas Christos Psonis Cyril Jaquier Daniel B. Cid +Daniel B. Daniel Black David Nutter Eric Gerbier |