| commit | bd91ee9cd78ac41ae37ffb06c4d711848cdf4bb0 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Apr 23 17:06:33 2015 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Apr 23 17:06:33 2015 -0400 |
| tree | f5d955ff0e693407ccbd2b9d0cdacccd85f75208 | |
| parent | d98c6773fa380848b75d55e652b4d5f40ac4d785 [diff] | |
| parent | 51454a62e235f27c28a24620c3df002d4076b57c [diff] |
merge 3.3 (#24044)