commit | 4be79aab2d6e390f39caa50e12ec1eb625e4bfbf | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:27:40 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:27:40 2015 -0800 |
tree | 97dfd92e164c48bfb9289ba4e220a72a1da7393d | |
parent | 608916af240a92d4cd4fe9793e7449cc1f96c9cd [diff] | |
parent | 8fc7d296a2735202720f935770fea772c3a0ba3e [diff] |
merge 3.5