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

[martin.panter]

https://hg.python.org/cpython/rev/cca2ed4e8b41
changeset:   99608:cca2ed4e8b41
parent:      99605:9a2cbf3c4324
parent:      99607:dcd2e66b8082
user:        Martin Panter <vadmium+py at gmail.com>
date:        Thu Dec 17 10:35:05 2015 +0000
summary:
  Merge from 3.5

files:



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