Merge branch 'stream_features' of github.com:fritzy/SleekXMPP into stream_features

This commit is contained in:
Lance Stout 2011-03-18 15:52:13 -04:00
commit dca8516cec

Diff content is not available