]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 15:33:47 +0000 (10:33 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 2 Mar 2016 15:33:47 +0000 (10:33 -0500)

Trivial merge