]> granicus.if.org Git - python/commitdiff
Merge 3.5
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 5 Aug 2015 23:02:03 +0000 (19:02 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 5 Aug 2015 23:02:03 +0000 (19:02 -0400)

Trivial merge