commit | 22ef4fa7e9805312c83b595b27218443c367dcd0 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 11 18:17:40 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 11 18:17:40 2012 -0500 |
tree | bc03d5f7dcfc79f277987cfc55d24c8f690638ac | |
parent | b2bf01d824ea5a13b375d0aa79211c01f8ab726a [diff] | |
parent | 982c91e4c9bbf8b8b62cda779d31beac2350fa58 [diff] |
merge heads