[1.0.X] Block trunk feature/enhancement work from svnmerge to branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9476 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
73d32af430
commit
5adf72e3ad