Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 30 Jun 2011 09:48:52 +0000 (11:48 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 30 Jun 2011 09:48:52 +0000 (11:48 +0200)

Trivial merge