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