Merge branch 'master' into develop

Conflicts:
	sleekxmpp/basexmpp.py

2 files changed, 3 insertions, 3 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
diff --git a/sleekxmpp/xmlstream/handler/callback.py b/sleekxmpp/xmlstream/handler/callback.py
index 37f53335..7e3388f1 100644
--- a/sleekxmpp/xmlstream/handler/callback.py
+++ b/sleekxmpp/xmlstream/handler/callback.py
@@ -33,7 +33,7 @@ class Callback(BaseHandler):
     :param matcher: A :class:`~sleekxmpp.xmlstream.matcher.base.MatcherBase`
                     derived object for matching stanza objects.
     :param pointer: The function to execute during callback.
-    :param bool thread: **DEPRECATED.** Remains only for 
+    :param bool thread: **DEPRECATED.** Remains only for
                         backwards compatibility.
     :param bool once: Indicates if the handler should be used only
                       once. Defaults to False.