| commit | 9e6097ebe7bb99a4a22b949ef4b1563b21ad7166 | [log] [tgz] |
|---|---|---|
| author | Barry Warsaw <barry@python.org> | Fri Nov 22 11:08:25 2013 -0500 |
| committer | Barry Warsaw <barry@python.org> | Fri Nov 22 11:08:25 2013 -0500 |
| tree | e51d885f796058f800d6b1a5179e782a9f2617e7 | |
| parent | 87b9637a86876f86302a659da3b2e52a5cae5314 [diff] | |
| parent | 5398e1a56e4483a16e4620758aad0d91e986653f [diff] |
Trunk merge.