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

[benjamin.peterson]

https://hg.python.org/cpython/rev/8d9bf18defd7
changeset:   95725:8d9bf18defd7
parent:      95723:cf0324e424b0
parent:      95724:512a2408181f
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Apr 19 23:14:57 2015 -0400
summary:
  merge 3.4

files:



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