Julian Arni c0f6ec6cf5 Merge branch 'master' into jkarni/docs-merge ...

Conflicts:
	docs/source/conf.py

2013-07-30 10:23:35 -04:00

..

source

Merge branch 'master' into jkarni/docs-merge

2013-07-30 10:23:35 -04:00

conf.py

fix breakage from dir renaming

2013-07-16 13:30:39 -04:00

Makefile

fix breakage from dir renaming

2013-07-16 13:30:39 -04:00