From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 4 Apr 2009 15:32:08 +0000 (+0000)
Subject: try to fix svnmerge-blocked property
X-Git-Tag: v3.1a2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85b30986f9a95ed93ae9bf87952b4df86e34d121;p=thirdparty%2FPython%2Fcpython.git

try to fix svnmerge-blocked property
---