From: Serhiy Storchaka <storchaka@gmail.com>
Date: Sat, 4 Jan 2014 20:49:40 +0000 (+0200)
Subject: Merge heads
X-Git-Tag: v3.4.0b2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78194cd4e920550bad4f9cad5f7411927ab3f458;p=python

Merge heads
---

78194cd4e920550bad4f9cad5f7411927ab3f458