[1.0.X] Updated svnmerge properties
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@11323 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
e6d5d886bf
commit
10e90f9350