]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Mon, 16 Nov 2015 20:12:44 +0000 (15:12 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Mon, 16 Nov 2015 20:12:44 +0000 (15:12 -0500)

Trivial merge