| commit | fe975a234fec6fa9c88b1d90d97542398267a484 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Dec 26 10:56:51 2014 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Dec 26 10:56:51 2014 -0600 |
| tree | 01be79ca7375ecf8a69670fce02581f5ac4f63ce | |
| parent | f2ad173eaf38140bd72a849f47e0427b3d941692 [diff] | |
| parent | 94cb7a24298ee0a4d6a3bb6b8ae80a7729e9f788 [diff] |
merge 3.4 (#23112)