]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Fri, 11 Dec 2015 16:34:11 +0000 (11:34 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Fri, 11 Dec 2015 16:34:11 +0000 (11:34 -0500)

Trivial merge