Lance Stout a278f79bdb Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/clientxmpp.py
2011-02-14 16:18:44 -05:00
..
2010-10-06 15:12:39 -04:00
2011-02-14 13:49:43 -05:00
2011-02-14 16:18:44 -05:00