commit | 384a3ea5c575832c3031eda50704dcfa86e9aebc | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun May 11 11:19:17 2014 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Sun May 11 11:19:17 2014 -0700 |
tree | 86d5ffe272dc62157826dac7b1c51db1b63d20f4 | |
parent | a6c4e1050c0c4a2da100e869434dc2262e993d5e [diff] | |
parent | 5c8ce188ee439a101d7a48e5a10bb98a2bd121ab [diff] |
merge 3.4