]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
branch merge
authorEthan Furman <ethan@stoneleaf.us>
Fri, 15 Jan 2016 23:03:12 +0000 (15:03 -0800)
committerEthan Furman <ethan@stoneleaf.us>
Fri, 15 Jan 2016 23:03:12 +0000 (15:03 -0800)

Trivial merge