From: Christopher Allan Webber Date: Thu, 1 Dec 2011 22:59:22 +0000 (-0600) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=8e2af2843f2de273f75cc1351bb87a905a11fb92;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 8e2af2843f2de273f75cc1351bb87a905a11fb92