| commit | 7dc35f6fea054f9e7488e3d06d4dfdaac86af310 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Fri Jul 15 21:10:44 2011 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Fri Jul 15 21:10:44 2011 -0500 |
| tree | 5bd23d03a1ff5abc6b1f506391b2a55c53671c76 | |
| parent | 0bd152cd67fef5c238ed15ba2ce09f6a74e8d334 [diff] | |
| parent | dc19c24832fac20402f6cf4d2396c299a73766bb [diff] |
merge heads