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

[georg.brandl]

https://hg.python.org/cpython/rev/980df829af33
changeset:   93301:980df829af33
parent:      93299:5a687f9ee76d
parent:      93300:2ff8b5ef1b16
user:        Georg Brandl <georg at python.org>
date:        Fri Oct 31 07:59:59 2014 +0100
summary:
  merge with 3.4

files:



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