commit | 8ec4ae0420f561a997a78d50144ff75ef53424fc | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun May 10 21:19:56 2015 -0400 |
committer | Benjamin Peterson <benjamin@python.org> | Sun May 10 21:19:56 2015 -0400 |
tree | 8264e77cc0d624ac461b92b2c5b4f0ba058abd80 | |
parent | 582d3fb1a5be2ffced3ca651227f486efbe1f477 [diff] | |
parent | 37c4f78390ae3f2c839b44939446f783b948d9d3 [diff] |
merge 3.4