From: Nick Coghlan <ncoghlan@gmail.com>
Date: Fri, 19 Oct 2012 13:40:58 +0000 (+1000)
Subject: Propagate dummy merge from 3.3
X-Git-Tag: v3.4.0a1~2219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3cf34cfbd83d31b9c1b5a079b199e338beb9f19;p=python

Propagate dummy merge from 3.3
---

f3cf34cfbd83d31b9c1b5a079b199e338beb9f19