Steven Hiscocks 77aa523f22 Merge branch 'master' into py3 ... Conflicts: .travis.yml server/datetemplate.py server/server.py testcases/filtertestcase.py		2013-03-30 22:51:36 +00:00
..
action.d	DOC: tags are documented in the jail.conf(5) man page	2013-03-17 10:52:49 +11:00
filter.d	ENH: Slight tune ups for fresh SOGo filter + comment into the sample log file	2013-03-27 11:09:54 -04:00
fail2ban.conf	Added ability to specify PID file	2013-02-17 22:14:01 +00:00
jail.conf	Merge branch 'master' into py3	2013-03-30 22:51:36 +00:00