| commit | 7eb65847da045ec77de8073efa06b9f1e9d7e243 | [log] [tgz] |
|---|---|---|
| author | Brian Curtin <brian@python.org> | Mon Nov 07 16:09:54 2011 -0600 |
| committer | Brian Curtin <brian@python.org> | Mon Nov 07 16:09:54 2011 -0600 |
| tree | 40882853874083faaf56093bb29c97da593f3e59 | |
| parent | 569b49432002a4750640c4b3883187796f2f5036 [diff] | |
| parent | e0912db24e33fa50b7dcb009b6a1a69bb17826c7 [diff] |
branch merge.