From: Georg Brandl <georg@python.org>
Date: Sun, 12 Jan 2014 07:10:39 +0000 (+0100)
Subject: merge heads
X-Git-Tag: v3.3.4rc1~80
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55c9e0366ee4477c34c881c942face4368cd4501;p=python

merge heads
---

55c9e0366ee4477c34c881c942face4368cd4501