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

[benjamin.peterson]

https://hg.python.org/cpython/rev/390ede7de560
changeset:   93037:390ede7de560
parent:      93036:6015b23bf918
parent:      93035:f4e291263a6d
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Oct 13 15:51:21 2014 -0400
summary:
  merge 3.4

files:



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