Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Tue, 3 May 2011 18:04:55 +0000 (20:04 +0200)
committerJoar Wandborg <git@wandborg.com>
Tue, 3 May 2011 18:04:55 +0000 (20:04 +0200)

Trivial merge