]> granicus.if.org Git - python/commitdiff
merge heads
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 6 Feb 2014 05:18:48 +0000 (00:18 -0500)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 6 Feb 2014 05:18:48 +0000 (00:18 -0500)

Trivial merge