Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
authorJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 21:01:40 +0000 (23:01 +0200)
committerJoar Wandborg <git@wandborg.com>
Thu, 29 Mar 2012 21:01:40 +0000 (23:01 +0200)

Trivial merge