]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merged 3.4 into default
authorDonald Stufft <donald@stufft.io>
Sun, 11 Jan 2015 20:53:02 +0000 (15:53 -0500)
committerDonald Stufft <donald@stufft.io>
Sun, 11 Jan 2015 20:53:02 +0000 (15:53 -0500)

Trivial merge