commit | 5d0bb852a25d010cc1aacf661d26a6bae1c8bf1a | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Feb 01 21:36:01 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Feb 01 21:36:01 2015 -0500 |
tree | 54d6a3f6338a8fec9015cf708f12007b4007e4bb | |
parent | 38d9772622fa13f7dc1033cd29bad1b15a31c8b4 [diff] | |
parent | c468b537cd227ce5484500a8f8ea7e932eabc7d5 [diff] |
merge 3.4 (#23364, #23363)