commit | 52c854a83819f1e5ec4aa907cdcc875b02a7ea07 | [log] [tgz] |
---|---|---|
author | Brett Cannon <brett@python.org> | Fri Jan 22 14:05:41 2016 -0800 |
committer | Brett Cannon <brett@python.org> | Fri Jan 22 14:05:41 2016 -0800 |
tree | b494f277b3ca8d716d2a841788094e336bab7d78 | |
parent | bf980797af74e57ea11f1a028d01d1b1aa384b6f [diff] | |
parent | 3bf1d87bbdc8f78113e56fd54ce69e26d9c317c3 [diff] |
Merge from 3.5