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

[georg.brandl]

https://hg.python.org/cpython/rev/82d1cb4486d3
changeset:   93267:82d1cb4486d3
parent:      93265:a2714f1d7f9b
parent:      93266:1eabc79a713e
user:        Georg Brandl <georg at python.org>
date:        Thu Oct 30 22:26:34 2014 +0100
summary:
  merge with 3.4

files:



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