| commit | e0bcca510ad2af33d1d62a922d8c3d36400f8bcf | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Nov 22 19:06:23 2011 -0600 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Nov 22 19:06:23 2011 -0600 |
| tree | 4d577fb2f93ced57725a64333d4b5fee040979a3 | |
| parent | 5944c369314a4e57e997eb855f45ccde96e37db7 [diff] | |
| parent | bc530324086fceab771e9ec5596d572fe452215e [diff] |
merge heads