summaryrefslogtreecommitdiff
path: root/THANKS
diff options
context:
space:
mode:
authorsebres <info@sebres.de>2014-10-25 19:05:53 +0200
committersebres <info@sebres.de>2014-10-25 19:05:53 +0200
commit361c22084604510e5e12444fe03d2b0828bcdbb5 (patch)
tree649821725a66437ae0901fb811264e1a25a6c017 /THANKS
parent3c01dcb01f25d0e234742ac778a931ebab0ad40c (diff)
parentfc145eb7954d7c6a413f26b433bc189139194bd8 (diff)
downloadfail2ban-361c22084604510e5e12444fe03d2b0828bcdbb5.tar.gz
Merge remote-tracking branch 'remotes/upstream/master' into sebres:ban-time-incr;
normalize code to python >= 2.6;
Diffstat (limited to 'THANKS')
-rw-r--r--THANKS1
1 files changed, 1 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index e8f628b8..33f7ea16 100644
--- a/THANKS
+++ b/THANKS
@@ -26,6 +26,7 @@ Christian Rauch
Christophe Carles
Christoph Haas
Christos Psonis
+craneworks
Cyril Jaquier
Daniel B. Cid
Daniel B.