commit | 4f99ce94703da719989e5cc47fe47b464f5c7514 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Jan 25 16:32:36 2012 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Jan 25 16:32:36 2012 -0500 |
tree | ecc43223a89fe8e6185f2745b71a0f3b53aaae5e | |
parent | a5f6d0e030e11b84e9e952f6ce688b32f232dda3 [diff] | |
parent | 131c7079d3f35883f4acc0b5fb7542feccfe3560 [diff] |
merge heads