]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 17 Dec 2015 23:26:53 +0000 (18:26 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 17 Dec 2015 23:26:53 +0000 (18:26 -0500)

Trivial merge