Christopher Allan Webber 24e6c34e88 Merge branch 'merge-pyconfigure' ...

Conflicts:
	docs/source/siteadmin/deploying.rst

2013-08-07 11:57:12 -05:00

..

source

Merge branch 'merge-pyconfigure'

2013-08-07 11:57:12 -05:00

Makefile

Fix sphinx warnsing in docs.

2013-03-17 17:39:31 -07:00