commit | e380e0986bcec1eff78655d559774d71417b799d | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Mon Mar 17 16:00:27 2014 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Mon Mar 17 16:00:27 2014 -0500 |
tree | 0dc9d8e047f4552d8ff3543bbdea4401a69ed349 | |
parent | 6373ba5199fe706f174aed482d77e2bb4b29e2f0 [diff] | |
parent | df813791db32867634c86c33714995dfeb651099 [diff] |
merge 3.4