Merge branch 'develop' into roster
commit8e46aa70543eb6cc003b69877e7677480db3a4dc
authorLance Stout <lancestout@gmail.com>
Tue, 26 Apr 2011 20:33:32 +0000 (26 16:33 -0400)
committerLance Stout <lancestout@gmail.com>
Tue, 26 Apr 2011 20:33:32 +0000 (26 16:33 -0400)
tree26d21e22fdc60e180d42c31998eea9f691fc3151
parent8a22597180cd9ec672515218aed1abe3529d2104
parent5399fdd3a95377bfb5bba993f299664557cabb7c
Merge branch 'develop' into roster
sleekxmpp/test/sleektest.py