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

[benjamin.peterson]

http://hg.python.org/cpython/rev/a666ac88e174
changeset:   85869:a666ac88e174
parent:      85868:135114c3abb3
parent:      85866:8494c47e7006
user:        Benjamin Peterson <benjamin at python.org>
date:        Sun Sep 29 15:00:35 2013 -0400
summary:
  merge heads

files:



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