]> granicus.if.org Git - python/commitdiff
#18707: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Fri, 16 Aug 2013 18:33:27 +0000 (21:33 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Fri, 16 Aug 2013 18:33:27 +0000 (21:33 +0300)
1  2 
README

diff --cc README
Simple merge