From 17b7a743a192b767dc261d51391945f3652be81b Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Thu, 13 Aug 2009 16:48:31 +0000
Subject: [PATCH] [1.0.X] Updated svn:ignore properties for
 tests/regressiontests/servers.

r11352 from trunk.

Also updated blocked and integrated svnmerge metadata.


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