From: R. David Murray <rdmurray@bitdance.com>
Date: Mon, 1 Mar 2010 17:43:44 +0000 (+0000)
Subject: Fix invalid svnmerge-integrated property edit from last commit.
X-Git-Tag: v3.1.2rc1~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fa06d42f3bc0f5a99be1b428652f8ddb7203f2d;p=thirdparty%2FPython%2Fcpython.git

Fix invalid svnmerge-integrated property edit from last commit.
---