From: Berker Peksag <berker.peksag@gmail.com>
Date: Sat, 27 Sep 2014 19:48:58 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.5.0a1~839
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a698ed75aab54b4735c20784b23c9387c8d0883;p=python

Merge heads.
---

8a698ed75aab54b4735c20784b23c9387c8d0883