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

[raymond.hettinger]

https://hg.python.org/cpython/rev/4121966ec301
changeset:   95843:4121966ec301
parent:      95840:b61690ba9432
parent:      95842:2d26f0f92b11
user:        Raymond Hettinger <python at rcn.com>
date:        Sat May 02 10:45:21 2015 -0700
summary:
  merge

files:



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