mirror of
https://github.com/django/django.git
synced 2025-07-18 16:49:13 +00:00
[1.0.X] Blocked r10826 from merge to branch as it's a fix to code added in a blocked changeset. Also replaced r10824 with r10822 in svnmerge-integrated as I believe that was the intent of r10825.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10827 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
cb73fe916e
commit
3cd3df814d