Lance Stout e2de82ac8d Merge branch 'develop' into stream_features ...

Conflicts:
	sleekxmpp/clientxmpp.py

2011-05-20 13:26:21 -04:00

..

__init__.py

Fix error with session feature.

2011-03-18 17:57:49 -04:00

atom.py

More PEP8 compliance cleanups.

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

bind.py

First pass at re-worked stream features.

2011-01-28 00:49:37 -05:00

error.py

Remap old method names in a better way.

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

htmlim.py

Remap old method names in a better way.

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

iq.py

Use underscore method name.

2011-04-08 16:14:22 -04:00

message.py

Remap old method names in a better way.

2011-02-14 13:49:43 -05: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

XMPPError exceptions can keep a stanza's contents.

2011-02-11 15:20:26 -05:00

roster.py

Remap old method names in a better way.

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

sasl.py

First pass at re-worked stream features.

2011-01-28 00:49:37 -05:00

session.py

Fix error with session feature.

2011-03-18 17:57:49 -04:00

stream_error.py

Make StreamError work properly.

2011-01-27 16:02:57 -05:00

stream_features.py

First pass at re-worked stream features.

2011-01-28 00:49:37 -05:00

tls.py

First pass at re-worked stream features.

2011-01-28 00:49:37 -05:00