]> granicus.if.org Git - python/commitdiff
Merge 3.4 (issues #24835, #24763)
authorYury Selivanov <yselivanov@sprymix.com>
Sun, 9 Aug 2015 22:21:58 +0000 (18:21 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Sun, 9 Aug 2015 22:21:58 +0000 (18:21 -0400)

Trivial merge