summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-05-03 15:29:58 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-05-03 15:29:58 (GMT)
commit63a6a6fd41da648c9e79a2e347c151e1957d74e9 (patch)
tree2995339e45c2cac9f6c843b8d1be4fb37ee6cd2e /Doc
parent4b7b82f1334ae9e860ff84979699875a833f968f (diff)
parent8c59816b70a30d8ec2ff4e60a8b4a747f8ff75db (diff)
downloadcpython-63a6a6fd41da648c9e79a2e347c151e1957d74e9.zip
cpython-63a6a6fd41da648c9e79a2e347c151e1957d74e9.tar.gz
cpython-63a6a6fd41da648c9e79a2e347c151e1957d74e9.tar.bz2
merge 3.4 (#24096)
Diffstat (limited to 'Doc')
0 files changed, 0 insertions, 0 deletions