default
Merge branch 'master' of github.com:zhil/sphinxapi

Conflicts:
	README.md