[1.2.X] Set svnmerge-integrated for 1.2.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13435 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
1fed500337
commit
ab693cea80