From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 2 May 2009 20:25:05 +0000 (+0000)
Subject: try to get merge props correct
X-Git-Tag: v3.1b1~77
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b612611b7f454b09689a5fb48c9b8b620ce303ff;p=thirdparty%2FPython%2Fcpython.git

try to get merge props correct
---