commit | 241520ad1038e20554f420e83c65694c5e3fa36a | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 13:24:21 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 02 13:24:21 2015 -0500 |
tree | 90ecb28fe70e8d15bc7c181449c6844fd2d7f1c0 | |
parent | 6c0a82038dcefb35d0421ca1da9b11b2219a39d4 [diff] | |
parent | 42fc0eb82712b1aa2890e5ee1c22be0bb7ddd83a [diff] |
merge heads