]> granicus.if.org Git - python/commitdiff
merge heads
authorEli Bendersky <eliben@gmail.com>
Tue, 29 May 2012 12:45:40 +0000 (15:45 +0300)
committerEli Bendersky <eliben@gmail.com>
Tue, 29 May 2012 12:45:40 +0000 (15:45 +0300)

Trivial merge