tree 165da355ed08948b1089584fbad09e4af8167f33
parent 77a8c1fbae04389be9a524ce565bb09b51ffec3e
parent 619b122cc8c213df558838ce9cc1c157a85a65b6
author Derek Jones <derek.jones@ellislab.com> 1318282375 -0500
committer Derek Jones <derek.jones@ellislab.com> 1318282375 -0500

Merge branch 'feature/userguide-toc' into develop

Conflicts:
	user_guide_src/source/_themes/eldocs/layout.html
	user_guide_src/source/general/index.rst
	user_guide_src/source/index.rst