2013-09-24
Merge branch 'master' of github.com:lidashuang/wiki-sphinx

Conflicts:
	github.rst