Lance Stout 72e1ab47fc Merge branch 'docs' into develop ...

Conflicts:
	docs/_static/haiku.css
	docs/_static/header.png
	docs/conf.py
	docs/getting_started/muc.rst
	docs/index.rst
	examples/muc.py

2012-01-18 15:04:33 -08:00

8.0 KiB

Raw Blame History

View Raw