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

Trivial merge