]> granicus.if.org Git - python/commitdiff
Merge 3.4.
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 13 May 2015 19:16:18 +0000 (15:16 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 13 May 2015 19:16:18 +0000 (15:16 -0400)

Trivial merge