Rodney Ewing 2119ee3b90 Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55 ...

Conflicts:
	docs/source/siteadmin/relnotes.rst

2013-07-31 15:27:22 -07:00

..

source

Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55

2013-07-31 15:27:22 -07:00

Makefile

Fix sphinx warnsing in docs.

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