commit | dc37ce95e8979d5d9e9c0777910bf94080d29115 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Oct 19 16:58:15 2011 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 19 16:58:15 2011 -0400 |
tree | b3c024b4ce9dfcab8fd4202849328208e1c027c4 | |
parent | becd56822ac62ba2ddb4956e84f6854366945617 [diff] | |
parent | 9d9141f5db7e7386f8f6480c03d4548dea2182fa [diff] |
merge 3.2