From: Serhiy Storchaka Date: Fri, 25 Jan 2013 14:08:46 +0000 (+0200) Subject: Merge heads X-Git-Tag: v3.3.1rc1~295 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5187c2b0cd8452aee4b6cfa4bb882f4ab67ca43;p=python Merge heads --- d5187c2b0cd8452aee4b6cfa4bb882f4ab67ca43