From: Antoine Pitrou Date: Sun, 11 Nov 2012 18:40:49 +0000 (+0100) Subject: Merge heads X-Git-Tag: v3.3.1rc1~644 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1de1394f54d6ed6934e3340159262a2a66833465;p=python Merge heads --- 1de1394f54d6ed6934e3340159262a2a66833465