summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-05-02 20:14:55 +0000
committerBenjamin Peterson <benjamin@python.org>2009-05-02 20:14:55 +0000
commit23b5c9cd649f6ede818cc17b13566379779f9414 (patch)
treea17b752f5965aaaa095e35213c6c00e733e7df4c
parent73bfca71d5b2bb75e4f9fa79965a6c21a44a671b (diff)
downloadcpython-23b5c9cd649f6ede818cc17b13566379779f9414.tar.gz
revert merge properties to something sane
0 files changed, 0 insertions, 0 deletions