]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 14:55:33 +0000 (10:55 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 14:55:33 +0000 (10:55 -0400)

Trivial merge