]> granicus.if.org Git - python/commitdiff
Merge from 3.5
authorBerker Peksag <berker.peksag@gmail.com>
Wed, 1 Jun 2016 16:36:40 +0000 (09:36 -0700)
committerBerker Peksag <berker.peksag@gmail.com>
Wed, 1 Jun 2016 16:36:40 +0000 (09:36 -0700)

Trivial merge