[Python-checkins] cpython (merge 3.5 -> default): Merge from 3.5

[brett.cannon]

https://hg.python.org/cpython/rev/0e40091e9a24
changeset:   102163:0e40091e9a24
parent:      102161:9c57178f13dc
parent:      102162:a9c21bc3c905
user:        Brett Cannon <brett at python.org>
date:        Fri Jun 24 12:23:23 2016 -0700
summary:
  Merge from 3.5

files:



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