| commit | 4f86193a689e6e017f1df4d8f14d1b7e9a2ffc6f | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Jun 28 21:49:49 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Jun 28 21:49:49 2011 -0500 |
| tree | 50020b9d4c3b3922ce72f5c41b61c4fc969d822e | |
| parent | 274271d1ae71dbd1177b54a5def45fed3ecb501f [diff] | |
| parent | 84d8fcfcf78622d1d5253c2f71878414bf4b54e9 [diff] |
merge 3.2