From: Larry Hastings <larry@hastings.org>
Date: Sun, 8 Feb 2015 00:21:34 +0000 (-0800)
Subject: Merge.
X-Git-Tag: v3.5.0a3~221^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a4631210c50bffd47cf44b0ca8db753a96c5b02e;p=python

Merge.
---

a4631210c50bffd47cf44b0ca8db753a96c5b02e