2 Commits

Author	SHA1	Message	Date
Julian Arni	c0f6ec6cf5	Merge branch 'master' into jkarni/docs-merge ... Conflicts: docs/source/conf.py	2013-07-30 10:23:35 -04:00
Lyla Fischer	e3fa27a3d8	moved docs into one repo. Broke compilation	2013-07-11 10:38:20 -04:00