]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Fri, 13 Nov 2015 17:29:03 +0000 (12:29 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Fri, 13 Nov 2015 17:29:03 +0000 (12:29 -0500)

Trivial merge