]> granicus.if.org Git - python/commitdiff
#15949, #15899: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 23 Sep 2012 13:03:21 +0000 (16:03 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 23 Sep 2012 13:03:21 +0000 (16:03 +0300)

Trivial merge