Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Mon, 2 Apr 2012 13:09:53 +0000 (15:09 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 2 Apr 2012 13:09:53 +0000 (15:09 +0200)

Trivial merge