commit | 8fc7d296a2735202720f935770fea772c3a0ba3e | [log] [tgz] |
---|---|---|
author | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:27:33 2015 -0800 |
committer | Benjamin Peterson <benjamin@python.org> | Sat Dec 05 00:27:33 2015 -0800 |
tree | b9a07c129d176d6dea0d3bcef34bc61ca5a27b40 | |
parent | c98bbd52896140821414d412949e9540b75a5371 [diff] | |
parent | e2825e9522e2beb3ced43b20cc7eb2e51236bedf [diff] |
merge 3.4