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

This commit is contained in:
Lance Stout 2011-05-20 13:27:39 -04:00
commit e694e4a791

Diff content is not available