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

Trivial merge