| commit | ba6a6cfbbc7359a871ef090f06ffeef1fb53e092 | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Tue Oct 16 09:52:02 2012 -0400 |
| committer | Benjamin Peterson <benjamin@python.org> | Tue Oct 16 09:52:02 2012 -0400 |
| tree | 758dd05d0e28b41c9eabbca39d8a855722d21da7 | |
| parent | bf67ba8f84f3e771193b44b25526d0258826052e [diff] | |
| parent | d86ceecf2141e684364d31c28941c6aacfbba47a [diff] |
merge heads