]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Tue, 4 Aug 2015 19:56:53 +0000 (15:56 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Tue, 4 Aug 2015 19:56:53 +0000 (15:56 -0400)

Trivial merge