Lance Stout 5820d49cd4 Merge branch 'master' into develop ...

Conflicts:
	sleekxmpp/basexmpp.py

2012-06-19 21:50:33 -07:00

..

features

Remove usage of deprecated getchildren() method.

2012-06-19 09:47:31 -07:00

plugins

Merge branch 'master' into develop

2012-06-19 21:50:33 -07:00

roster

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

stanza

Fix assigning values to error stanzas.

2012-06-19 16:21:34 -07:00

test

Remove usage of deprecated getchildren() method.

2012-06-19 09:47:31 -07:00

thirdparty

Added the Socksipy module in the thirdparty of SleekXMPP.

2012-06-07 19:02:09 +02:00

xmlstream

Allow message and presence stanzas to be embedded as substanzas.

2012-06-19 16:20:54 -07:00

__init__.py

Clean and get setup.py working once and for all.

2011-08-24 22:09:02 -07:00

api.py

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

basexmpp.py

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

clientxmpp.py

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

componentxmpp.py

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

exceptions.py

PEP8 formatting updates.

2012-06-19 01:29:48 -07:00

version.py

Bump version to 1.1.5

2012-06-15 15:36:01 -07:00