[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