From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Wed, 20 Mar 2013 03:26:39 +0000 (-0700)
Subject: Merge with 3.3
X-Git-Tag: v3.4.0a1~1142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5a6e25470bb4f40c5bdd586641d7a4fce5fb64a;p=python

Merge with 3.3
---

d5a6e25470bb4f40c5bdd586641d7a4fce5fb64a