]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 5 Nov 2015 19:29:19 +0000 (14:29 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 5 Nov 2015 19:29:19 +0000 (14:29 -0500)

Trivial merge