Merge branch 'develop' into roster
commitd3bd9cd31d3cbf99d02539ecf4d3de20eafb8c8a
authorLance Stout <lancestout@gmail.com>
Fri, 20 May 2011 17:46:36 +0000 (20 13:46 -0400)
committerLance Stout <lancestout@gmail.com>
Fri, 20 May 2011 17:46:36 +0000 (20 13:46 -0400)
tree2630acba573d0365b8f0b93ec698700b0d0cc867
parente3b14bc5a9fde7037b309359be8ff1abf5447735
parent6a07e7cbe3e995f44ca3ba75a0ff83616269cf5a
Merge branch 'develop' into roster
sleekxmpp/clientxmpp.py