slixmpp/sleekxmpp
Lance Stout a3597d6deb Merge branch 'develop' into roster
Conflicts:
	sleekxmpp/basexmpp.py
2011-06-14 14:24:25 -07:00
..
2011-05-31 10:59:14 -07:00
2011-05-31 10:59:14 -07:00
2011-04-08 16:39:39 -04:00
2011-06-14 14:24:25 -07:00
2011-05-20 17:42:40 -04:00