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

[barry.warsaw]

https://hg.python.org/cpython/rev/23be7b70aa46
changeset:   94546:23be7b70aa46
parent:      94544:1ef6db8558b2
parent:      94545:7a82b1539401
user:        Barry Warsaw <barry at python.org>
date:        Fri Feb 06 12:00:57 2015 -0500
summary:
  Merge

files:



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