Merge branch 'release-0.4.1'

Conflicts:
	mediagoblin/_version.py

diff --cc docs/source/siteadmin/relnotes.rst
Simple merge

diff --cc mediagoblin/_version.py
index 2abc105ff9f48a38641c43cdfd3ae9ce7ecefb1b,1aa0e2c43cb2a54066498780a55a789512f7bfd8..94629775ea7e33d61295fc1e27613c4d335207ab
--- 1/mediagoblin/_version.py
--- 2/mediagoblin/_version.py
+++ b/mediagoblin/_version.py
@@@ -23,4 -23,4 +23,4 @@@
  
  # see http://www.python.org/dev/peps/pep-0386/
  
- __version__ = "0.4.1.dev"
 -__version__ = "0.4.1"
++__version__ = "0.5.0.dev"

diff --cc setup.py
Simple merge