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

Conflicts:
	docs/index.rst
This commit is contained in:
Lance Stout 2012-01-18 15:34:12 -08:00
commit 22cc194ed8

Diff content is not available