Merge branch 'master' into 0.10

# Conflicts:
#	fail2ban/client/jailreader.py
#	fail2ban/helpers.py

1 files changed, 3 insertions, 3 deletions

diff --git a/fail2ban/helpers.py b/fail2ban/helpers.py
index b5ffe601..7660e64a 100644
--- a/fail2ban/helpers.py
+++ b/fail2ban/helpers.py
@@ -133,15 +133,15 @@ def excepthook(exctype, value, traceback):
 		"Unhandled exception in Fail2Ban:", exc_info=True)
 	return sys.__excepthook__(exctype, value, traceback)
 
-def splitcommaspace(s):
-	"""Helper to split on any comma or space
+def splitwords(s):
+	"""Helper to split words on any comma, space, or a new line
 
 	Returns empty list if input is empty (or None) and filters
 	out empty entries
 	"""
 	if not s:
 		return []
-	return filter(bool, re.split('[ ,]', s))
+	return filter(bool, map(str.strip, re.split('[ ,\n]+', s)))
 
 
 class BgService(object):