]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge
authorEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 17:59:17 +0000 (11:59 -0600)
committerEric Snow <ericsnowcurrently@gmail.com>
Sat, 30 May 2015 17:59:17 +0000 (11:59 -0600)

Trivial merge