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

Merge heads.
---

c5deed3a1497316d4aa2ac350048d0c770016bc7