Lance Stout c16913c999 Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/basexmpp.py
2010-12-13 14:36:53 -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-17 01:49:51 -05: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-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