mirror of
https://github.com/django/django.git
synced 2025-10-10 15:29:11 +00:00
Merge of r11025 and r11026 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11027 bcc190cf-cafb-0310-a4f2-bffc1f526a37