]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Sun, 2 Aug 2015 20:49:44 +0000 (16:49 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Sun, 2 Aug 2015 20:49:44 +0000 (16:49 -0400)

Trivial merge