From: Christopher Allan Webber Date: Sun, 22 Apr 2012 15:06:52 +0000 (-0500) Subject: Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fe449159223cef27bba2ad47726ffee67e9a29cc;p=mediagoblin.git Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin --- fe449159223cef27bba2ad47726ffee67e9a29cc