Merge branch 'develop' into roster
commite1360ae04946a4b6f9fe7ed19f9349ce24405dd1
authorLance Stout <lancestout@gmail.com>
Tue, 22 Mar 2011 16:00:01 +0000 (22 12:00 -0400)
committerLance Stout <lancestout@gmail.com>
Tue, 22 Mar 2011 16:00:01 +0000 (22 12:00 -0400)
tree7f0ecd15d0b242b05d43bdc60aa064e399778f9e
parentb048f8d733dd7121d820fa196b5de5c9a77adae2
parent86a6b40fd81daa7d0e976dbc63f33544060c75d1
Merge branch 'develop' into roster
sleekxmpp/clientxmpp.py