]> granicus.if.org Git - python/commitdiff
#20135: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Sun, 6 Jul 2014 17:59:19 +0000 (20:59 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Sun, 6 Jul 2014 17:59:19 +0000 (20:59 +0300)

Trivial merge