]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Fri, 16 Mar 2012 13:30:53 +0000 (15:30 +0200)
committerEli Bendersky <eliben@gmail.com>
Fri, 16 Mar 2012 13:30:53 +0000 (15:30 +0200)

Trivial merge