Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Fri, 1 Jul 2011 20:02:58 +0000 (22:02 +0200)
committerJoar Wandborg <git@wandborg.com>
Fri, 1 Jul 2011 20:02:58 +0000 (22:02 +0200)

Trivial merge