From: Christopher Allan Webber Date: Mon, 12 Mar 2012 23:38:35 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=849cf91fc8feeed308b5f54fd53d1940bf23058b;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 849cf91fc8feeed308b5f54fd53d1940bf23058b