[1.0.X] Updated svnmerge properties for recent changes
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
6541739765
commit
fc15d690b1