Lance Stout a278f79bdb Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/clientxmpp.py
2011-02-14 16:18:44 -05:00
..
2010-10-07 19:42:28 -04:00
2010-10-07 10:58:13 -04:00
2010-11-05 21:18:48 -04:00
2010-10-07 10:58:13 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2010-11-05 21:18:48 -04:00
2011-02-08 21:09:49 -05:00
2010-11-05 21:18:48 -04:00
2010-11-17 01:49:51 -05:00
2010-11-17 01:54:30 -05:00
2010-11-05 21:18:48 -04:00
2010-12-08 00:18:04 -05:00