commit | 7763c68dcd8ac6fa3e7d24197ea1fae614eaacb2 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Jun 27 14:18:23 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Jun 27 14:18:23 2015 -0500 |
tree | 293955f950ea96ad0428c24f14037621c1d318db | |
parent | a7c781724f32bbc659894e5e1ee9f7f18d1252c6 [diff] | |
parent | ff0f322edbb200c1dadd287c3355a5bc006d7fa6 [diff] |
merge 3.4