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

[benjamin.peterson]

https://hg.python.org/cpython/rev/cf86a04d68e7
changeset:   99457:cf86a04d68e7
branch:      3.4
parent:      99453:693d0b030626
parent:      99456:39a709f1ca3a
user:        Benjamin Peterson <benjamin at python.org>
date:        Sat Dec 05 00:27:23 2015 -0800
summary:
  merge 3.3

files:



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