]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge
authorJason R. Coombs <jaraco@jaraco.com>
Sat, 2 Nov 2013 15:57:54 +0000 (11:57 -0400)
committerJason R. Coombs <jaraco@jaraco.com>
Sat, 2 Nov 2013 15:57:54 +0000 (11:57 -0400)

Trivial merge