Files
slixmpp/sleekxmpp/stanza/roster.py
Lance Stout a278f79bdb Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/clientxmpp.py
2011-02-14 16:18:44 -05:00

3.9 KiB