commit | fd97a6fb2d501f0ecb104513b5c0c1707dd6f87e | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Sep 29 23:02:56 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Sep 29 23:02:56 2014 -0400 |
tree | d4d43de4c1a506173f669af209e539fa7c5176f8 | |
parent | 58ee2d31ab2dc039c6929347bf6cfb0cfd827198 [diff] | |
parent | 43030ee78041455566e7f78d6d5135eaa3455294 [diff] |
merge 3.4 (#22520)