| commit | b612611b7f454b09689a5fb48c9b8b620ce303ff | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat May 02 20:25:05 2009 +0000 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat May 02 20:25:05 2009 +0000 |
| tree | 1a0a90493cc544ff5cb6e6b99faf83643f050d0c | |
| parent | 65b42a1e8fe2edc03ccec0e37bc8a06cdd593675 [diff] |
try to get merge props correct