[1.0.x] Updated SVN merge properties for some recent commits.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
424d158b01
commit
2656e6bfa9