]> granicus.if.org Git - python/commitdiff
#15796: merge with 3.2.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 18 Sep 2012 04:21:18 +0000 (07:21 +0300)
1  2 
Modules/_io/_iomodule.c
Modules/_io/iobase.c
Modules/_io/textio.c

Simple merge
Simple merge
Simple merge