try to get merge props correct
authorBenjamin Peterson <benjamin@python.org>
Sat, 2 May 2009 20:25:05 +0000 (20:25 +0000)
committerBenjamin Peterson <benjamin@python.org>
Sat, 2 May 2009 20:25:05 +0000 (20:25 +0000)
commitb612611b7f454b09689a5fb48c9b8b620ce303ff
tree1a0a90493cc544ff5cb6e6b99faf83643f050d0c
parent65b42a1e8fe2edc03ccec0e37bc8a06cdd593675
try to get merge props correct