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

[benjamin.peterson]

https://hg.python.org/cpython/rev/1ea01f2c5b10
changeset:   95907:1ea01f2c5b10
parent:      95906:1bc0e1aad3dd
parent:      95904:69e8ed66d4d6
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed May 06 21:32:14 2015 -0400
summary:
  merge heads

files:



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