diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-12-31 21:17:01 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-12-31 21:17:01 -0500 |
| commit | 6b6995bb0b80c91eda72bc92974f68133cef93a3 (patch) | |
| tree | f4d2ceaa271092ef54ec7de99f1a0ca802e4d1f2 /examples/echo_component.py | |
| parent | 27c658922e51aaae722880e18878cb2964cb4bd0 (diff) | |
| parent | 1b0fd76b45bb1c6e6409aa6e3e0b0c2edf5ba374 (diff) | |
| download | slixmpp-6b6995bb0b80c91eda72bc92974f68133cef93a3.tar.gz slixmpp-6b6995bb0b80c91eda72bc92974f68133cef93a3.tar.bz2 slixmpp-6b6995bb0b80c91eda72bc92974f68133cef93a3.tar.xz slixmpp-6b6995bb0b80c91eda72bc92974f68133cef93a3.zip | |
Merge branch 'develop' into develop-1.1
Diffstat (limited to 'examples/echo_component.py')
| -rwxr-xr-x | examples/echo_component.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/echo_component.py b/examples/echo_component.py index d8bcd752..82f6eb9f 100755 --- a/examples/echo_component.py +++ b/examples/echo_component.py @@ -11,7 +11,7 @@ import sys import logging -import time +import getpass from optparse import OptionParser import sleekxmpp |