summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-06-11 20:33:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2016-06-11 20:33:17 (GMT)
commitb5ad54990fc74fe043c91d2a005c7c32c931bc5d (patch)
tree1acfe2e4ea825172c06709c961c474cb6921d17e /Lib
parentb0557e729e07e63f36d91d1d631424616373a384 (diff)
parent196d7db3956f4c0b03e87b570771b3460a61bab5 (diff)
downloadcpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.zip
cpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.tar.gz
cpython-b5ad54990fc74fe043c91d2a005c7c32c931bc5d.tar.bz2
merge 3.4 (#26556)
Diffstat (limited to 'Lib')
0 files changed, 0 insertions, 0 deletions