commit | 239e90196e609a3e1ba2fc10528a1a5df3bf0911 | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sun Jun 07 00:00:48 2015 -0500 |
committer | Benjamin Peterson <benjamin@python.org> | Sun Jun 07 00:00:48 2015 -0500 |
tree | 1ef5454c29846d5516b422aa3563e6c8356f3544 | |
parent | 4a931adef38d8b4daaf7c7d6736f9806550a8bb9 [diff] | |
parent | 0718de977076fe01026b862453797ea0ee8a3fe2 [diff] |
Merge 3.5