Files
slixmpp/sleekxmpp/plugins/__init__.py
Lance Stout 5820d49cd4 Merge branch 'master' into develop
Conflicts:
	sleekxmpp/basexmpp.py
2012-06-19 21:50:33 -07:00

2.0 KiB