| commit | 5a3c6dbe6a9c6100dcdf91e9773d50d97268e1ba | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sun Apr 07 09:53:49 2013 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Sun Apr 07 09:53:49 2013 -0400 |
| tree | fd50a3c04227f900de3224a1782872c1b7e6832e | |
| parent | 20efcfaf538c52c7d65117bf8427b6b248c54dbe [diff] | |
| parent | 8ab1e513c1451895afd95ef2e07905ab07dc9909 [diff] |
merge heads