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

[benjamin.peterson]

http://hg.python.org/cpython/rev/4acff7c4bd02
changeset:   90132:4acff7c4bd02
parent:      90128:c9239171e429
parent:      90131:bfc0f54e66a8
user:        Benjamin Peterson <benjamin at python.org>
date:        Fri Apr 04 09:52:18 2014 -0400
summary:
  merge 3.4

files:



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