]> granicus.if.org Git - python/commitdiff
#21690: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Thu, 19 Jun 2014 21:55:10 +0000 (00:55 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Thu, 19 Jun 2014 21:55:10 +0000 (00:55 +0300)

Trivial merge