]> granicus.if.org Git - python/commit
merge heads
authorBenjamin Peterson <benjamin@python.org>
Mon, 5 Sep 2016 17:17:30 +0000 (10:17 -0700)
committerBenjamin Peterson <benjamin@python.org>
Mon, 5 Sep 2016 17:17:30 +0000 (10:17 -0700)
commit177a42438d9ab8e8b261f6dc7efb10b1c401d710
tree6372bf774d996d812bbaed4accc6ce3521905993
parent98020812e6f82d22308f4fc1169fe066254d3a72
parent64c7c8638922c2d06ffe8d4dcbb1d7b7b5979058
merge heads