From: Kristján Valur Jónsson <sweskman@gmail.com>
Date: Sat, 12 Sep 2015 16:41:22 +0000 (+0000)
Subject: Merge
X-Git-Tag: v3.6.0a1~1572
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3d6e7b0e347185f0e6ada250abe2b730852d5b81;p=python

Merge
---

3d6e7b0e347185f0e6ada250abe2b730852d5b81