commit | 450c1586c022391fb9e4925240c322f76aa6a68f | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Tue Jun 17 00:34:56 2014 -0700 |
committer | Benjamin Peterson <benjamin@python.org> | Tue Jun 17 00:34:56 2014 -0700 |
tree | df5597227e2891198821d7e342617b2ec5b9ff5d | |
parent | 89cef795eba63eef63eb2a7349ef7631f4071ab9 [diff] | |
parent | 59830b6ec4e07394e2ecfccb8683add64b4139d7 [diff] |
merge 3.4