Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop
commitcd800d636aa683dc562047bc517be7d1a9bb25c2
authorLance Stout <lancestout@gmail.com>
Thu, 27 Jan 2011 21:05:15 +0000 (27 16:05 -0500)
committerLance Stout <lancestout@gmail.com>
Thu, 27 Jan 2011 21:05:15 +0000 (27 16:05 -0500)
tree8471bacb0f00aed3bbcc56c26925bddbd5b51816
parent40642b2cd1460678a6cdaa5bf64b93248a11b523
parentb4004cd4d677d6e6c0504d38f7ef0c18db23c71d
Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop