From: Christopher Allan Webber Date: Wed, 20 Apr 2011 00:05:58 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9ec591086111b77eef0d961b07791a418b667509;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- 9ec591086111b77eef0d961b07791a418b667509