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

Trivial merge