]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 13:41:56 +0000 (09:41 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Wed, 24 Jun 2015 13:41:56 +0000 (09:41 -0400)

Trivial merge