From f98243375c0e8f0a9618b7103d005ef4131288f9 Mon Sep 17 00:00:00 2001
From: Karen Tracey <kmtracey@gmail.com>
Date: Mon, 6 Oct 2008 18:02:19 +0000
Subject: [PATCH] [1.0.X] Set svnmerge.py metadata to block non-bugfix
 changesets from trunk.

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