https://hg.python.org/cpython/rev/242a7cafc5e7 changeset: 96364:242a7cafc5e7 parent: 96362:e7af362b78df parent: 96363:b85028c9d4b9 user: Eric Snow <ericsnowcurrently at gmail.com> date: Fri May 29 22:34:01 2015 -0600 summary: Merge from 3.5 files: -- Repository URL: https://hg.python.org/cpython