Files
slixmpp/tests/test_pubsubstanzas.py
Brian Beggs d763795b2c Merge remote branch 'fritzy/master'
Conflicts:
	sleekxmpp/__init__.py
	sleekxmpp/basexmpp.py
	sleekxmpp/stanza/error.py
2010-07-01 09:17:45 -04:00

18 KiB