Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 8 Sep 2011 13:12:43 +0000 (08:12 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Thu, 8 Sep 2011 13:12:43 +0000 (08:12 -0500)
commitf373599bd745b7afa58013c4b6a17d1c59769cdb
tree077aeb3825a2cad6871874d0cfa03bcfcd62fba7
parent34fddf47f0b4f7cfa9fbd865bd9eb8ae96913ce4
parentf7ab66707c4d5ef5941e13131dbf9ce2a8c7a875
Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality'

Conflicts:
mediagoblin/auth/routing.py
mediagoblin/auth/forms.py
mediagoblin/auth/lib.py
mediagoblin/auth/routing.py
mediagoblin/auth/views.py
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/templates/mediagoblin/auth/login.html
mediagoblin/tests/test_auth.py