Christopher Allan Webber 2ae78574b3 Merge branch 'release-0.4.1' ...

Conflicts:
	mediagoblin/_version.py

2013-07-10 17:40:57 -05:00

..

source

Merge branch 'release-0.4.1'

2013-07-10 17:40:57 -05:00

Makefile

Moves docs files around so we build from source/ directory

2011-07-31 17:54:54 -04:00