From: cfdv <caldavis@gmail.com>
Date: Mon, 20 Jun 2011 17:50:44 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into is315
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=78c0744077b58fb4c20a965fdbbb52055922d793;p=mediagoblin.git

Merge remote-tracking branch 'origin/master' into is315
---

78c0744077b58fb4c20a965fdbbb52055922d793