From ab693cea8096149302b3f4ecf8eede6a358a9621 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Sat, 17 Jul 2010 09:31:09 +0000
Subject: [PATCH] [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