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

[benjamin.peterson]

http://hg.python.org/cpython/rev/3e1a07504eb6
changeset:   90861:3e1a07504eb6
parent:      90859:004d7014cc38
parent:      90860:ee9fe0b43fa3
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon May 26 15:53:56 2014 -0700
summary:
  null merge 3.4

files:



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