From: Joar Wandborg Date: Sun, 12 Jun 2011 12:37:49 +0000 (+0200) Subject: Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a48014d67a5185c645ac876d365b4cb85cbb6b1f;p=mediagoblin.git Merge branch 'master' of git.gitorious.org/mediagoblin/mediagoblin --- a48014d67a5185c645ac876d365b4cb85cbb6b1f