From: Christopher Allan Webber Date: Fri, 19 Aug 2011 17:31:31 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0cbab848b9d0540085e61f6db472982c1c2bc102;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 0cbab848b9d0540085e61f6db472982c1c2bc102