commit | 5c0fb00ad80d6c70a9a51f3e3d2c1bfcecbd0840 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Oct 01 00:12:20 2011 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Oct 01 00:12:20 2011 -0400 |
tree | ac7ae0ee1e40736073c3ea37c0e33051339ee825 | |
parent | 31616ea2ffca7a1603c9f5941cfca2f1330028f3 [diff] | |
parent | de636f3c34f326fc7b07e4288d411be38d2a299c [diff] |
merge heads