]> granicus.if.org Git - python/commitdiff
Merge
authorSteve Dower <steve.dower@microsoft.com>
Sat, 16 Jan 2016 20:41:03 +0000 (12:41 -0800)
committerSteve Dower <steve.dower@microsoft.com>
Sat, 16 Jan 2016 20:41:03 +0000 (12:41 -0800)

Trivial merge