]> granicus.if.org Git - python/commitdiff
null merge with 3.4.
authorYury Selivanov <yselivanov@sprymix.com>
Mon, 8 Dec 2014 17:40:53 +0000 (12:40 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Mon, 8 Dec 2014 17:40:53 +0000 (12:40 -0500)

Trivial merge