slixmpp/sleekxmpp
Lance Stout de6170a13d Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/basexmpp.py
2011-02-02 09:13:22 -05:00
..
2011-01-31 15:40:00 -05:00
2011-02-02 09:13:22 -05:00
2011-02-02 09:13:22 -05:00
2010-10-06 14:20:32 -04:00
2011-02-02 09:13:22 -05:00
2010-10-25 15:09:56 -04:00
2011-01-10 16:33:30 -05:00