Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 14:19:11 +0000 (16:19 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 14:19:11 +0000 (16:19 +0200)

Trivial merge