Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 11:46:30 +0000 (13:46 +0200)
committerJoar Wandborg <git@wandborg.com>
Sat, 7 May 2011 11:46:30 +0000 (13:46 +0200)

Trivial merge