commit | 05cd4c602b4f16606dd046dfad51f1d0465d9d85 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Aug 02 18:49:38 2011 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Aug 02 18:49:38 2011 -0500 |
tree | 0392ca53241122ca4957e19f4a2c89f5bd73e2fb | |
parent | 18592ca58916e3e1526a84dad8652a5329fefa08 [diff] | |
parent | bbb8dec69edf0d7b11f68df32bbb3b442560dbe2 [diff] |
merge heads