| commit | 7d214018119eeee43abc14db6385a2b684d1e4f8 | [log] [tgz] |
|---|---|---|
| author | Barry Warsaw <barry@python.org> | Fri Jun 03 20:07:41 2011 -0400 |
| committer | Barry Warsaw <barry@python.org> | Fri Jun 03 20:07:41 2011 -0400 |
| tree | 523baed630f71b1faba6eaf232cbb256095595b3 | |
| parent | e3826c77745a251b4f2cdd82f9e1b352f3b13bec [diff] | |
| parent | d0366e862a5d4c9bcd9c13e564ca1089fd97b83c [diff] |
Null merge from 2.6.