summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2014-12-30 21:16:13 (GMT)
committerBenjamin Peterson <benjamin@python.org>2014-12-30 21:16:13 (GMT)
commitbfdec6263f7ad9965d3c15f0535a7a08ac805af1 (patch)
tree2bfb68e4bb78748863a0a0713a0e374637d1b143 /Doc
parent5d4e27ecee12c2c2dc33b31a6128bcf4297574ac (diff)
parent36fe7926f888ba154b64904b91a5dd8c83e6c167 (diff)
downloadcpython-bfdec6263f7ad9965d3c15f0535a7a08ac805af1.zip
cpython-bfdec6263f7ad9965d3c15f0535a7a08ac805af1.tar.gz
cpython-bfdec6263f7ad9965d3c15f0535a7a08ac805af1.tar.bz2
merge 3.4 (#23111)
Diffstat (limited to 'Doc')
0 files changed, 0 insertions, 0 deletions