| commit | fc93ec5966f67b94cd46c3b8ab6400a54f3443ac | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Mon Nov 12 17:04:43 2012 -0500 |
| committer | Benjamin Peterson <benjamin@python.org> | Mon Nov 12 17:04:43 2012 -0500 |
| tree | e12a6ddccd266f6ca3e23cb2374f5cbd7dd0f744 | |
| parent | c7a8a210d614fbab47595bc88876c0365105e99a [diff] | |
| parent | e262377cabc59f0c7d574ce608b61f692601608b [diff] |
merge heads