]> granicus.if.org Git - python/commitdiff
Merge 3.4
authorYury Selivanov <yselivanov@sprymix.com>
Tue, 8 Apr 2014 18:58:35 +0000 (14:58 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Tue, 8 Apr 2014 18:58:35 +0000 (14:58 -0400)

Trivial merge