commit | ff670467915a4daf83faac0bf6e633fc1ba81497 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Apr 11 16:12:21 2012 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Apr 11 16:12:21 2012 -0400 |
tree | 66ff41800070542385e7cc27f2b8f09adb2cfc8c | |
parent | a82f3edc1358796b4012f38532a13929917ddd5b [diff] | |
parent | 5f7e7345cf4f583c127160aa43ee5c3fea7ba06f [diff] |
merge heads