Lance Stout 484efff156 Merge branch 'develop' into roster ...

Conflicts:
	setup.py
	sleekxmpp/clientxmpp.py

2011-08-12 16:47:58 -07:00

..

__init__.py

Continued reorganization and streamlining.

2011-07-01 14:45:55 -07:00

atom.py

More PEP8 compliance cleanups.

2010-10-06 15:12:39 -04:00

error.py

Fix ordering bug when retrieving an error condition.

2011-07-02 22:50:31 -07:00

htmlim.py

Remap old method names in a better way.

2011-02-14 13:49:43 -05:00

iq.py

IqTimeout now references the original sent stanza.

2011-06-01 15:28:33 -07:00

message.py

Fix stanza clobbering when replying to errors.

2011-06-20 16:25:56 -07:00

nick.py

Remap old method names in a better way.

2011-02-14 13:49:43 -05:00

presence.py

Remap old method names in a better way.

2011-02-14 13:49:43 -05:00

rootstanza.py

So using sys.excepthook to catch errors only works once.

2011-07-01 15:18:10 -07:00

roster.py

Merge branch 'develop' into roster

2011-02-14 16:18:44 -05:00

stream_error.py

Continued reorganization and streamlining.

2011-07-01 14:45:55 -07:00

stream_features.py

Fix XEP-0078 using the new stream feature workflow.

2011-08-06 12:30:56 -07:00