| commit | d73f369f4c52e921ba225043c0a820856369ef44 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Thu Jan 03 20:34:40 2013 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Thu Jan 03 20:34:40 2013 -0800 |
| tree | 4bc702b04312d48bc99c52c7621e15ef99f3c0ac | |
| parent | 0a2c4f55c4d3288dce74513ef135fae167646f02 [diff] | |
| parent | c44057dfbdb4e4f651e7cc4761aa63b7e8d128c3 [diff] |
merge heads