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

[benjamin.peterson]

https://hg.python.org/cpython/rev/b2d238adf802
changeset:   94683:b2d238adf802
parent:      94682:e7dcab87ff6c
parent:      94681:78145e6ffb40
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Feb 18 08:56:47 2015 -0500
summary:
  merge 3.4

files:



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