Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin