commit | 174baa39f61d1512343359970996925652d65092 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Oct 13 11:58:23 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Oct 13 11:58:23 2012 -0400 |
tree | ac30ab8a7f85b035d47e4c4c83b53749c0a61e9f | |
parent | d541d3fee4bfee130cbec9ee6f9cf1a96c77ec3e [diff] | |
parent | fe4985a1bb5db145e2e7598e0868e190e2436445 [diff] |
merge heads