| commit | 81c393b3ded977375d35297b3d47b47014b2391a | [log] [tgz] |
|---|---|---|
| author | Georg Brandl <georg@python.org> | Tue Apr 10 19:30:22 2012 +0200 |
| committer | Georg Brandl <georg@python.org> | Tue Apr 10 19:30:22 2012 +0200 |
| tree | 019a61deb1e295a43eb3d932b60f036dceb14f15 | |
| parent | 44036016b9ac8c1ceeb2a634585513ccb674c571 [diff] | |
| parent | a7f6b14fa6c7ebe402a62cd425fb7aeb007080a3 [diff] |
Merge.