Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Fri, 6 May 2011 08:37:08 +0000 (10:37 +0200)
committerJoar Wandborg <git@wandborg.com>
Fri, 6 May 2011 08:37:08 +0000 (10:37 +0200)

Trivial merge