From: Giampaolo Rodola' <g.rodola@gmail.com>
Date: Sat, 21 Jun 2014 11:59:25 +0000 (+0200)
Subject: merge heads
X-Git-Tag: v3.5.0a1~1443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=47177861dd7995b4cd27acb9757f0e804e3f06e4;p=python

merge heads
---

47177861dd7995b4cd27acb9757f0e804e3f06e4