Lance Stout 06a9d9fc30 Merge branch 'master' into develop ... Conflicts: sleekxmpp/thirdparty/__init__.py		2012-07-31 21:33:19 -07:00
..
__init__.py	Merge branch 'master' into develop	2012-07-31 21:33:19 -07:00
gnupg.py	Add support for XEP-0027	2012-04-06 15:22:23 -04:00
mini_dateutil.py	Fix instances of using undefined variables.	2012-02-18 11:56:10 -08:00
ordereddict.py	Added ordereddict implementation to thirdparty.	2010-12-21 17:33:31 -05:00
socks.py	Added the Socksipy module in the thirdparty of SleekXMPP.	2012-06-07 19:02:09 +02:00
statemachine.py	Correct the statemachine's ensure_any method.	2012-04-06 17:39:51 -04:00