From: Berker Peksag <berker.peksag@gmail.com>
Date: Wed, 6 May 2015 03:36:29 +0000 (+0300)
Subject: Merge heads.
X-Git-Tag: v3.5.0b1~239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c4c59050c898afad23279edc89daf6c677ecdbf4;p=python

Merge heads.
---

c4c59050c898afad23279edc89daf6c677ecdbf4