| commit | b36a05094d16bfb86c1b113bcab769ca6dbeee7a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Wed Oct 10 14:10:44 2012 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Wed Oct 10 14:10:44 2012 -0400 |
| tree | b137758b30fa94c2b3f4a5388b69128d159bdaf9 | |
| parent | 00f86f2202ca7dc78604b387ae61e269b90f0079 [diff] | |
| parent | db8570349e3a3d02e3fe4300232c3b1ecd9c8259 [diff] |
merge heads