From: Rodney Ewing <ewing.rj@gmail.com>
Date: Mon, 3 Jun 2013 23:20:19 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master' into basic_auth
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e784d10d2e8b8f9f7a5980883553766ce9bfaf6c;p=mediagoblin.git

Merge remote-tracking branch 'upstream/master' into basic_auth
---

e784d10d2e8b8f9f7a5980883553766ce9bfaf6c