From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Tue, 4 Oct 2011 00:01:14 +0000 (-0400)
Subject: Fixed conflict in /auth/views.py.
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=43199340a25ab0aa252796f1c865e9ebf0e96649;p=mediagoblin.git

Fixed conflict in /auth/views.py.
---

43199340a25ab0aa252796f1c865e9ebf0e96649