]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 02:40:34 +0000 (21:40 -0500)
committerBenjamin Peterson <benjamin@python.org>
Tue, 21 Jun 2011 02:40:34 +0000 (21:40 -0500)
commit66b371e0001f5a8de4765c23e2e88e610fb4808d
tree3b4fd04b6a4a25454a3196e01307c4945a2d8ce6
parentf63d615f8bae0a2ad994fb65e37b8657da93a941
parent2fae27b735f4d93c8a7789a7a98857e1ce3c7193
merge heads