commit | 4fd55ca5258d445c727d7eb1218cc377071c38e2 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 15:50:37 2014 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Oct 13 15:50:37 2014 -0400 |
tree | ae56c08a9b2e1dd1669f57581cea791daf03f126 | |
parent | 157da6fdd27ba56ee298f24def28f8093d989580 [diff] | |
parent | 0f4f048fa5ff06438a4624bc1dc02aa458a79748 [diff] |
merge heads