]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorSteve Dower <steve.dower@microsoft.com>
Sun, 13 Sep 2015 21:41:24 +0000 (14:41 -0700)
committerSteve Dower <steve.dower@microsoft.com>
Sun, 13 Sep 2015 21:41:24 +0000 (14:41 -0700)

Trivial merge