]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 20:21:03 +0000 (15:21 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 15 Mar 2011 20:21:03 +0000 (15:21 -0500)
commit8af4919b37914e73ec547e4216b309705f2f5283
tree732fa1d744c3157a843c6d5dbb1c116ab6553472
parentc217a4b71a847326ce4e6e47f1d52fe45ad005fb
parent8213cafd62a70881d38f9f8e88097b5af4bf998d
merge heads