]> granicus.if.org Git - python/commitdiff
#15949, 15899: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 22 Sep 2012 08:25:22 +0000 (11:25 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 22 Sep 2012 08:25:22 +0000 (11:25 +0300)

Trivial merge