]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 19:00:35 +0000 (15:00 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 29 Sep 2013 19:00:35 +0000 (15:00 -0400)
commitc82d9dee0fa41c07d7e400d8fe432f4be506c38c
tree3472e365510b5dafb477a883b589a5b2cd7839e5
parenteea020f1ae07580129ca47eb731289f0b8c829dc
parentb321fe1f274a3186e86c3982da76cf71f2050f0c
merge heads