[1.0.X] Blocked recent trunk update from merge to branch
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
7560497a50
commit
a827ba72a1