Merge commit '231252516' into dinsic

* commit '231252516':
  Fix "argument of type 'ObservableDeferred' is not iterable" error (#7708)

1 files changed, 1 insertions, 1 deletions

diff --git a/synapse/util/async_helpers.py b/synapse/util/async_helpers.py

index df42486351..65abf0846e 100644
--- a/synapse/util/async_helpers.py
+++ b/synapse/util/async_helpers.py
@@ -93,7 +93,7 @@ class ObservableDeferred(object):
 
         This returns a brand new deferred that is resolved when the underlying
         deferred is resolved. Interacting with the returned deferred does not
-        effect the underdlying deferred.
+        effect the underlying deferred.
         """
         if not self._result:
             d = defer.Deferred()