From: Éric Araujo <merwok@netwok.org>
Date: Mon, 17 Mar 2014 20:50:35 +0000 (-0400)
Subject: Merge 3.4
X-Git-Tag: v3.5.0a1~2103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42867c73c9794f8f4968abef0572fd950748559c;p=python

Merge 3.4
---

42867c73c9794f8f4968abef0572fd950748559c