Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 16:07:04 +0000 (18:07 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 16:07:04 +0000 (18:07 +0200)

Trivial merge