| commit | 8d33598e5dd021aaac4f155ab319bad3ba4e1eef | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Dec 15 10:05:13 2014 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Dec 15 10:05:13 2014 -0500 |
| tree | 9228bc46f8a872e48f1729dd4868ee1db19d555c | |
| parent | 65ee4674e290ba893509f51f192dd1c9aa3a0422 [diff] | |
| parent | 4c11c92578c32f218f8840ab56c4cc8df9923172 [diff] |
merge 3.4 (#23053)