]> granicus.if.org Git - python/commitdiff
#18588: merge with 3.4.
authorEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 14:01:48 +0000 (17:01 +0300)
committerEzio Melotti <ezio.melotti@gmail.com>
Mon, 4 Aug 2014 14:01:48 +0000 (17:01 +0300)

Trivial merge