From: Christopher Allan Webber Date: Sun, 31 Jul 2011 02:51:15 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=90870c07d409b1d6a4c3d16cc17df33b694e2f43;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 90870c07d409b1d6a4c3d16cc17df33b694e2f43