Merge branch 'stream_features' of github.com:fritzy/SleekXMPP into stream_features
commitdca8516cec2d2802930491ea886cd98f81727cbb
authorLance Stout <lancestout@gmail.com>
Fri, 18 Mar 2011 19:52:13 +0000 (18 15:52 -0400)
committerLance Stout <lancestout@gmail.com>
Fri, 18 Mar 2011 19:52:13 +0000 (18 15:52 -0400)
tree8a5d8192e3e0ed06cdb124a15daad5039a62e479
parentf2c99798a6cf0dafe10fd547b036ecbb7a32569b
parentc2161ca56b4c9c1ce8dabd32ed36cd4902b4eefc
Merge branch 'stream_features' of github.com:fritzy/SleekXMPP into stream_features