From ba925def4900e7e932c1a15836ea5358872f9403 Mon Sep 17 00:00:00 2001
From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sun, 13 Sep 2009 17:04:47 +0000
Subject: [PATCH] [1.1.X] Updated svnmerge properties

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11576 bcc190cf-cafb-0310-a4f2-bffc1f526a37