http://hg.python.org/cpython/rev/4a0c5adfc027 changeset: 91296:4a0c5adfc027 parent: 91295:5958a89fb1ed parent: 91292:b7f2d30e93a8 user: Charles-François Natali <cf.natali at gmail.com> date: Fri Jun 20 22:41:46 2014 +0100 summary: Merge. files: -- Repository URL: http://hg.python.org/cpython