From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Sun, 22 Jun 2014 10:44:05 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.5.0a1~1441
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc8197a287b151ac1f3b94a4308f34ba9a1633df;p=python

merge heads
---

bc8197a287b151ac1f3b94a4308f34ba9a1633df