From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Mon, 21 Feb 2011 19:17:56 +0000 (-0500)
Subject: Merge branch 'master' of git://github.com/melinath/philo
X-Git-Tag: philo-0.9~18
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/6f2781d1ebfccf4c9d5f36a56402f05c161a972c

Merge branch 'master' of git://github.com/melinath/philo

* 'master' of git://github.com/melinath/philo:
  Corrected JSONValue.__unicode__ to return unicode instead of bytestrings... not sure what it was being modeled on. Tweaked TargetURLModel to use smart_str instead of str to construct the Python < 2.6.5 kwargs to get a more consistent byte string.
  Corrected WaldoAuthenticationForm.clean to handle lack of password/username. Moved password-related forms into a class attribute for customizability. Standardized confirmation email context and allowed for a secure confirmation link.
  Tweaked TargetURLModel.get_reverse_params() to convert kwargs keys to bytestrings to support Python versions prior to 2.6.5
  Minor correction to BlogView.urlpatterns.
---

6f2781d1ebfccf4c9d5f36a56402f05c161a972c