commit | 275c848736f1c15efc15b84ced315218ac639899 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 31 14:06:07 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 31 14:06:07 2012 -0400 |
tree | 24711a1bba751953e8b819623bff0bcae08888ce | |
parent | d1f2cb37a2d1cc7b098abf6bc403fb5d43128051 [diff] | |
parent | 64085e306495769161dc278c5c61490dc767e598 [diff] |
merge heads