]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:17:19 +0000 (05:17 -0800)
committerEli Bendersky <eliben@gmail.com>
Sun, 13 Jan 2013 13:17:19 +0000 (05:17 -0800)

Trivial merge