commit | 31cd7562b045f28692bf906f66534704760b3609 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Wed Apr 29 18:00:57 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Wed Apr 29 18:00:57 2015 -0400 |
tree | cdf7dd057737312f87b15faad7c4e4110dd07065 | |
parent | 919587090cb360594c48eb7a554018d238965ff2 [diff] | |
parent | b0335ee2fec4bcc1ad66400f195efdf1e4696845 [diff] |
merge 3.4