]> granicus.if.org Git - python/commitdiff
#21928: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Tue, 5 Aug 2014 05:14:59 +0000 (08:14 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Tue, 5 Aug 2014 05:14:59 +0000 (08:14 +0300)

Trivial merge