slixmpp/sleekxmpp
Lance Stout c16913c999 Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/basexmpp.py
2010-12-13 14:36:53 -05:00
..
2010-12-13 14:36:53 -05:00
2010-12-13 14:36:53 -05:00
2010-10-06 14:20:32 -04:00
2010-12-13 14:36:53 -05:00
2010-10-25 15:09:56 -04:00
2010-11-17 01:54:30 -05:00