From: Christopher Allan Webber Date: Mon, 1 Aug 2011 01:53:29 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=bfb280d3b3cdb801adda381cdf47f96e5b936526;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- bfb280d3b3cdb801adda381cdf47f96e5b936526