]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 15:39:13 +0000 (10:39 -0500)
committerBenjamin Peterson <benjamin@python.org>
Sun, 5 Jul 2015 15:39:13 +0000 (10:39 -0500)
commit95f9dd5e72d6a72db0ad7438b65990cba30cf36b
tree38b113eeaf7a49a906bb11f471c28c58b35d3bcd
parentd5d77aac60453694445d1509b51d7514871dbff8
parentd423396394c49a339b78f2026a1fdab42a1cffb0
merge heads