| commit | bff13be344131f2492acb891bb184abaf17a8e3a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Feb 23 10:48:03 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Feb 23 10:48:03 2012 -0500 |
| tree | fb5d015f4aed64f3a16babd2dd7a144ed696930a | |
| parent | c09424255a5f1d9a108c14f974cfc55b2f4734f3 [diff] | |
| parent | 31833d4728ec476e1af69f03ac5f412c47035cc4 [diff] |
merge 3.1 (with 3.1.5rc1 release tag)