From: Victor Stinner <victor.stinner@gmail.com>
Date: Fri, 18 Sep 2015 14:33:04 +0000 (+0200)
Subject: Merge 3.5 (test_email)
X-Git-Tag: v3.6.0a1~1519
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f409c7cd1b8d3c365378252b76a804eab55e412e;p=thirdparty%2FPython%2Fcpython.git

Merge 3.5 (test_email)
---

f409c7cd1b8d3c365378252b76a804eab55e412e