Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Sun, 12 Jun 2011 12:37:49 +0000 (14:37 +0200)
committerJoar Wandborg <git@wandborg.com>
Sun, 12 Jun 2011 12:37:49 +0000 (14:37 +0200)

Trivial merge