changeset:   90699:889896471498
parent:      90696:217006c5455f
parent:      90698:2e116176a81f
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Wed May 14 17:09:39 2014 +0200
files:       Doc/library/codecs.rst Misc/ACKS
description:
Merge 3.4: ignore change specific to 3.4 for #21488, I had a different patch for Python 3.5