]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 17 Dec 2015 00:31:40 +0000 (19:31 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 17 Dec 2015 00:31:40 +0000 (19:31 -0500)

Trivial merge