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

Conflicts:
	README.md