]> granicus.if.org Git - python/commitdiff
#20634: merge with 3.3.
authorEzio Melotti <ezio.melotti@gmail.com>
Sat, 15 Feb 2014 11:01:41 +0000 (13:01 +0200)
committerEzio Melotti <ezio.melotti@gmail.com>
Sat, 15 Feb 2014 11:01:41 +0000 (13:01 +0200)

Trivial merge