From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Mon, 24 Dec 2012 18:00:05 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.4.0a1~1785
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04a7e4432c61e1d622d00818c1de4b837174f30b;p=python

merge heads
---

04a7e4432c61e1d622d00818c1de4b837174f30b