[Python-checkins] cpython (merge 3.5 -> default): Merge for issue #25609

[brett.cannon]

https://hg.python.org/cpython/rev/14cf0011c5e9
changeset:   100987:14cf0011c5e9
parent:      100985:1eb586d5b321
parent:      100986:257dd57dd732
user:        Brett Cannon <brett at python.org>
date:        Fri Apr 15 10:51:46 2016 -0700
summary:
  Merge for issue #25609

files:



-- 
Repository URL: https://hg.python.org/cpython