diff -r b758351d191f -r cc9b7e14412b web/lib/django/contrib/admin/templates/registration/password_reset_email.html
--- a/web/lib/django/contrib/admin/templates/registration/password_reset_email.html	Wed May 19 17:43:59 2010 +0200
+++ b/web/lib/django/contrib/admin/templates/registration/password_reset_email.html	Tue May 25 02:43:45 2010 +0200
@@ -4,7 +4,7 @@
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %}
+{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}