commit | 9fa47ebafedaf1aef4480bc115b182a62efb79e1 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Thu Apr 26 00:27:06 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Thu Apr 26 00:27:06 2012 -0400 |
tree | 0d97445bce1727b9003c43c1dfa8cfbb3787ce5f | |
parent | 1138944888d13d2600241ca0d9408e018077d691 [diff] | |
parent | e0d88a173c5ccc346b8d7c6e805f0e49b4ea92f7 [diff] |
merge heads