| commit | 3253fb1cb313e0e997fd75c0450d0c879b3a4772 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Apr 04 13:59:46 2014 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Apr 04 13:59:46 2014 -0400 |
| tree | 3ae3f6c22195c5e00185ab6f7554cd16c9626512 | |
| parent | a04dbe4fe7c2bacfb48b338ed4248a58c540beea [diff] | |
| parent | 511e222e0aa120e15632752613c96493dbe8a672 [diff] |
merge 3.4 (#21128)