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

[zach.ware]

https://hg.python.org/cpython/rev/74b1a0001dc8
changeset:   96868:74b1a0001dc8
branch:      3.5
parent:      96863:78dc519d055c
parent:      96867:0f5a57b822c2
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Mon Jul 06 23:30:16 2015 -0500
summary:
  Merge 3.4

files:



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