summaryrefslogtreecommitdiffstats
path: root/Lib/encodings
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2014-01-27 01:10:56 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2014-01-27 01:10:56 (GMT)
commit62ea43cc063b75d3ba1e5080da1e3ec8aef2de51 (patch)
tree6c780fa8cca3cb694570129cf1e79c66d5e52496 /Lib/encodings
parent30d68c66e36864408972149f2ec341f8eda68adf (diff)
parente7a72a194d769a6a92a3ea4d70e7429df646452f (diff)
downloadcpython-62ea43cc063b75d3ba1e5080da1e3ec8aef2de51.zip
cpython-62ea43cc063b75d3ba1e5080da1e3ec8aef2de51.tar.gz
cpython-62ea43cc063b75d3ba1e5080da1e3ec8aef2de51.tar.bz2
Merge heads.
Diffstat (limited to 'Lib/encodings')
0 files changed, 0 insertions, 0 deletions