]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge heads.
authorEric Snow <ericsnowcurrently@gmail.com>
Fri, 22 Nov 2013 20:55:59 +0000 (13:55 -0700)
committerEric Snow <ericsnowcurrently@gmail.com>
Fri, 22 Nov 2013 20:55:59 +0000 (13:55 -0700)

Trivial merge