| commit | 0c13d1af6364ed89831d3b8104458fa4180cf00a | [log] [tgz] |
|---|---|---|
| author | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 11:45:48 2015 -0800 |
| committer | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 11:45:48 2015 -0800 |
| tree | 2b202f00fcfc79e7f67edf6d2cf95936c601c4b7 | |
| parent | f9d11e815a6d671714c27bd8d5ab2f4922c3eec6 [diff] | |
| parent | bee7f7cc821e44bccd64f3957fb170fdc05a33b9 [diff] |
merge 2.7.11 branch