]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 4 Jun 2015 15:10:36 +0000 (11:10 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 4 Jun 2015 15:10:36 +0000 (11:10 -0400)

Trivial merge