| commit | ae64b4d8e252974121f5233507736986695fca2b | [log] [tgz] |
|---|---|---|
| author | Georg Brandl <georg@python.org> | Sun Jun 24 16:11:23 2012 +0200 |
| committer | Georg Brandl <georg@python.org> | Sun Jun 24 16:11:23 2012 +0200 |
| tree | 1dff7715b8d9b3dc743a2e1a464bb6f51eb523ad | |
| parent | 3b44d81cf956effe4088839ebf96e1950b92eb2c [diff] | |
| parent | 4f9946874ba591326d57d60bbeef9e4f51432ac7 [diff] |
Merge heads.