]> granicus.if.org Git - python/commitdiff
Merge
authorYury Selivanov <yselivanov@sprymix.com>
Thu, 14 May 2015 22:33:14 +0000 (18:33 -0400)
committerYury Selivanov <yselivanov@sprymix.com>
Thu, 14 May 2015 22:33:14 +0000 (18:33 -0400)

Trivial merge