| commit | a65d121607d675eed3cc69cc5b0afdf07211003d | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jan 16 09:53:22 2014 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 16 09:53:22 2014 -0500 |
| tree | a52f6c4fb6dcb09ef6c98f0d716e49a1a2497db1 | |
| parent | 7936c81d517fa0165b14d893a946855d2cb48fa1 [diff] | |
| parent | 216e47d83424718325b45a730b7d764434764089 [diff] |
merge 3.3 (#20278)