mirror of
https://github.com/django/django.git
synced 2025-10-13 00:39:10 +00:00
Partial merge of r10031 and r10071 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10086 bcc190cf-cafb-0310-a4f2-bffc1f526a37