Merge branch 'master' into develop

Conflicts:
	sleekxmpp/basexmpp.py

1 files changed, 2 insertions, 2 deletions

diff --git a/sleekxmpp/xmlstream/handler/base.py b/sleekxmpp/xmlstream/handler/base.py
index 59dcb306..01c1991a 100644
--- a/sleekxmpp/xmlstream/handler/base.py
+++ b/sleekxmpp/xmlstream/handler/base.py
@@ -49,7 +49,7 @@ class BaseHandler(object):
     def match(self, xml):
         """Compare a stanza or XML object with the handler's matcher.
 
-        :param xml: An XML or 
+        :param xml: An XML or
             :class:`~sleekxmpp.xmlstream.stanzabase.ElementBase` object
         """
         return self._matcher.match(xml)
@@ -73,7 +73,7 @@ class BaseHandler(object):
         self._payload = payload
 
     def check_delete(self):
-        """Check if the handler should be removed from the list 
+        """Check if the handler should be removed from the list
         of stream handlers.
         """
         return self._destroy