Deluge
diff options
| author | Andrew Resch <andrewresch@gmail.com> | 2010-02-20 09:12:40 -0800 |
|---|---|---|
| committer | Andrew Resch <andrewresch@gmail.com> | 2010-02-20 09:12:40 -0800 |
| commit | 443d4d7a3af487c26067555142a9c4a33b1d159b (patch) | |
| tree | ce8c3e2da3e6b3b73900ca6108d80215404fe974 | |
| parent | 34fb2def755f2414013220b4b0e12c42ee9093d7 (diff) | |
| parent | dc35732896ffb7a94def2056d31f955311fcdfed (diff) | |
| download | deluge-443d4d7a3af487c26067555142a9c4a33b1d159b.tar.gz deluge-443d4d7a3af487c26067555142a9c4a33b1d159b.tar.bz2 deluge-443d4d7a3af487c26067555142a9c4a33b1d159b.zip | |
Merge branch '1.2-stable' of deluge-torrent.org:deluge into 1.2-stable
| -rw-r--r-- | deluge/ui/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/deluge/ui/client.py b/deluge/ui/client.py index 2abcd0a1e..3aa620aa0 100644 --- a/deluge/ui/client.py +++ b/deluge/ui/client.py @@ -312,7 +312,7 @@ class DaemonSSLProxy(DaemonProxy): def pop_deferred(self, request_id): """ - Pops a Deffered object. This is generally called once we receive the + Pops a Deferred object. This is generally called once we receive the reply we were waiting on from the server. :param request_id: int, the request_id of the Deferred to pop |