]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 25 Jun 2015 15:54:49 +0000 (11:54 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 25 Jun 2015 15:54:49 +0000 (11:54 -0400)

Trivial merge