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
mini_dateutil.py
ordereddict.py
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