slixmpp/sleekxmpp
Lance Stout a278f79bdb Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/clientxmpp.py
2011-02-14 16:18:44 -05:00
..
2011-02-14 16:18:44 -05:00
2011-02-02 09:13:22 -05:00
2011-02-14 13:50:59 -05:00
2010-10-06 14:20:32 -04:00
2011-02-14 16:18:44 -05:00
2011-02-08 19:15:50 -05:00