]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Thu, 9 Jun 2016 06:18:56 +0000 (23:18 -0700)
committerBenjamin Peterson <benjamin@python.org>
Thu, 9 Jun 2016 06:18:56 +0000 (23:18 -0700)
commitcff5ec6be36b0eef010d8b2afc444e60838217d0
treec8293641f48268eccb6c1c96752fa7ba98033acf
parentb3e073cbb3af2999e6e589f55ec2fc8a109fdc14
parentd5982d0433ec29fbacf9c05ddd5fd8ed884af6bd
merge heads