]> granicus.if.org Git - python/commitdiff
Merge from 3.5.
authorEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 15:34:28 +0000 (09:34 -0600)
committerEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 15:34:28 +0000 (09:34 -0600)

Trivial merge