]> granicus.if.org Git - python/commitdiff
Merge 3.5 (issue #24325 & #24400)
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 16:51:55 +0000 (12:51 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 16:51:55 +0000 (12:51 -0400)

Trivial merge