Merge branch 'master' of github.com:comoga/django-enroll

Conflicts: enroll/forms.py
comoga · Jun 2, 2011 · a4b0e5e · a4b0e5e
2 parents 0ad3928 + d749267
commit a4b0e5e
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/enroll/forms.py b/enroll/forms.py
@@ -205,6 +205,7 @@ def clean(self):
         self.validate_password_couple()
         return super(PasswordResetStepTwoForm, self).clean()
 
+
     def save(self):
         self.user.set_password(self.cleaned_data['password1'])
         self.user.is_active = True