From: Christopher Allan Webber Date: Sun, 26 Jun 2011 20:22:01 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=da0683b48c9ed6fc4ada1aff758e493bd2311d48;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- da0683b48c9ed6fc4ada1aff758e493bd2311d48